From 6eb67d516d02e1835eacc35fd804a9cca0b8a035 Mon Sep 17 00:00:00 2001 From: kmille Date: Mon, 15 Oct 2018 17:08:29 +0200 Subject: [PATCH 1/3] Update to rompr 1.2.1 --- apache/Dockerfile | 2 +- apache/Dockerfile.arm32v7 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 39416b62..138cf2f2 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -23,7 +23,7 @@ ADD apache_default /etc/apache2/sites-available/000-default.conf RUN a2enmod rewrite RUN a2enmod expires RUN a2enmod headers -RUN curl -L -o rompr.zip https://github.com/fatg3erman/RompR/releases/download/1.21/rompr-1.21.zip +RUN curl -L -o rompr.zip https://github.com/fatg3erman/RompR/releases/download/1.22/rompr-1.22.zip RUN mkdir -p /app RUN unzip -d /app rompr.zip RUN mkdir /app/rompr/prefs diff --git a/apache/Dockerfile.arm32v7 b/apache/Dockerfile.arm32v7 index 6bccba23..149f7847 100644 --- a/apache/Dockerfile.arm32v7 +++ b/apache/Dockerfile.arm32v7 @@ -23,7 +23,7 @@ ADD apache_default /etc/apache2/sites-available/000-default.conf RUN a2enmod rewrite RUN a2enmod expires RUN a2enmod headers -RUN curl -L -o rompr.zip https://github.com/fatg3erman/RompR/releases/download/1.21/rompr-1.21.zip +RUN curl -L -o rompr.zip https://github.com/fatg3erman/RompR/releases/download/1.22/rompr-1.22.zip RUN mkdir -p /app RUN unzip -d /app rompr.zip RUN mkdir /app/rompr/prefs From 9a294a07264e2fc27afa86d14fc0c223a9cf4d99 Mon Sep 17 00:00:00 2001 From: Marco Gilbert Date: Mon, 29 Oct 2018 13:47:12 +0100 Subject: [PATCH 2/3] correct location for apache2.conf --- apache/Dockerfile | 3 +-- apache/Dockerfile.arm32v7 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 138cf2f2..038d1c53 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -16,8 +16,7 @@ RUN apt-get update && \ php-xml \ php-mbstring \ php-sqlite3 -RUN echo "ServerName localhost" >> /etc/apache2/apache./conf - +RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf ADD apache_default /etc/apache2/sites-available/000-default.conf RUN a2enmod rewrite diff --git a/apache/Dockerfile.arm32v7 b/apache/Dockerfile.arm32v7 index 149f7847..2ed90447 100644 --- a/apache/Dockerfile.arm32v7 +++ b/apache/Dockerfile.arm32v7 @@ -16,8 +16,7 @@ RUN apt-get update && \ php-xml \ php-mbstring \ php-sqlite3 -RUN echo "ServerName localhost" >> /etc/apache2/apache.conf - +RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf ADD apache_default /etc/apache2/sites-available/000-default.conf RUN a2enmod rewrite From f33b64cac5927795696f161d9104cccf4e997f2e Mon Sep 17 00:00:00 2001 From: Marco Gilbert Date: Mon, 29 Oct 2018 14:00:35 +0100 Subject: [PATCH 3/3] build a 15% smaller image with debian:stretch-slim and some cleanup --- apache/Dockerfile | 31 ++++++++++++++++--------------- apache/Dockerfile.arm32v7 | 31 ++++++++++++++++--------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 038d1c53..86e8d2f6 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -1,21 +1,22 @@ -FROM ubuntu:18.04 +FROM debian:stretch-slim MAINTAINER rawdlite@gmail.com # Install packages ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && \ - apt-get -y install \ - curl \ - libapache2-mod-php \ - php-mysql \ - php-curl \ - php-gd \ - unzip \ - imagemagick \ - php-json \ - php-xml \ - php-mbstring \ - php-sqlite3 +RUN apt-get update \ + && apt-get -yq install \ + curl \ + libapache2-mod-php \ + php-mysql \ + php-curl \ + php-gd \ + unzip \ + imagemagick \ + php-json \ + php-xml \ + php-mbstring \ + php-sqlite3 \ + && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /usr/share/doc-base/* RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf ADD apache_default /etc/apache2/sites-available/000-default.conf @@ -24,7 +25,7 @@ RUN a2enmod expires RUN a2enmod headers RUN curl -L -o rompr.zip https://github.com/fatg3erman/RompR/releases/download/1.22/rompr-1.22.zip RUN mkdir -p /app -RUN unzip -d /app rompr.zip +RUN unzip -d /app rompr.zip && rm rompr.zip RUN mkdir /app/rompr/prefs RUN mkdir /app/rompr/albumart RUN chown -R www-data:www-data /app/rompr diff --git a/apache/Dockerfile.arm32v7 b/apache/Dockerfile.arm32v7 index 2ed90447..4d5e03f1 100644 --- a/apache/Dockerfile.arm32v7 +++ b/apache/Dockerfile.arm32v7 @@ -1,21 +1,22 @@ -FROM arm32v7/ubuntu +FROM arm32v7/debian:stretch-slim MAINTAINER rawdlite@gmail.com # Install packages ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && \ - apt-get -y install \ - curl \ - libapache2-mod-php \ - php-mysql \ - php-curl \ - php-gd \ - unzip \ - imagemagick \ - php-json \ - php-xml \ - php-mbstring \ - php-sqlite3 +RUN apt-get update \ + && apt-get -yq install \ + curl \ + libapache2-mod-php \ + php-mysql \ + php-curl \ + php-gd \ + unzip \ + imagemagick \ + php-json \ + php-xml \ + php-mbstring \ + php-sqlite3 \ + && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /usr/share/doc-base/* RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf ADD apache_default /etc/apache2/sites-available/000-default.conf @@ -24,7 +25,7 @@ RUN a2enmod expires RUN a2enmod headers RUN curl -L -o rompr.zip https://github.com/fatg3erman/RompR/releases/download/1.22/rompr-1.22.zip RUN mkdir -p /app -RUN unzip -d /app rompr.zip +RUN unzip -d /app rompr.zip && rm rompr.zip RUN mkdir /app/rompr/prefs RUN mkdir /app/rompr/albumart RUN chown -R www-data:www-data /app/rompr