From 43eefc24ff73f6f0501eecf7b3bdbefdd5171ad7 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 25 Aug 2019 22:58:48 +0200 Subject: [PATCH] Fixings for offical-images - Fixed *.sh mode - Removed label - Fixed RUN settings - Removed superfluous debMultiarch --- 2019.06/apache/Dockerfile | 11 ++++------- 2019.06/apache/cron.sh | 0 2019.06/apache/entrypoint.sh | 0 2019.06/fpm-alpine/Dockerfile | 5 ++--- 2019.06/fpm-alpine/cron.sh | 0 2019.06/fpm-alpine/entrypoint.sh | 0 2019.06/fpm/Dockerfile | 8 ++------ 2019.06/fpm/cron.sh | 0 2019.06/fpm/entrypoint.sh | 0 2019.09-dev/apache/Dockerfile | 11 ++++------- 2019.09-dev/apache/cron.sh | 0 2019.09-dev/apache/entrypoint.sh | 0 2019.09-dev/fpm-alpine/Dockerfile | 5 ++--- 2019.09-dev/fpm-alpine/cron.sh | 0 2019.09-dev/fpm-alpine/entrypoint.sh | 0 2019.09-dev/fpm/Dockerfile | 8 ++------ 2019.09-dev/fpm/cron.sh | 0 2019.09-dev/fpm/entrypoint.sh | 0 2019.09-rc/apache/Dockerfile | 11 ++++------- 2019.09-rc/apache/cron.sh | 0 2019.09-rc/apache/entrypoint.sh | 0 2019.09-rc/fpm-alpine/Dockerfile | 5 ++--- 2019.09-rc/fpm-alpine/cron.sh | 0 2019.09-rc/fpm-alpine/entrypoint.sh | 0 2019.09-rc/fpm/Dockerfile | 8 ++------ 2019.09-rc/fpm/cron.sh | 0 2019.09-rc/fpm/entrypoint.sh | 0 Dockerfile-alpine.template | 5 ++--- Dockerfile-debian.template | 8 ++------ docker-cron.sh | 0 docker-entrypoint.sh | 0 update.sh | 2 +- 32 files changed, 29 insertions(+), 58 deletions(-) mode change 100644 => 100755 2019.06/apache/cron.sh mode change 100644 => 100755 2019.06/apache/entrypoint.sh mode change 100644 => 100755 2019.06/fpm-alpine/cron.sh mode change 100644 => 100755 2019.06/fpm-alpine/entrypoint.sh mode change 100644 => 100755 2019.06/fpm/cron.sh mode change 100644 => 100755 2019.06/fpm/entrypoint.sh mode change 100644 => 100755 2019.09-dev/apache/cron.sh mode change 100644 => 100755 2019.09-dev/apache/entrypoint.sh mode change 100644 => 100755 2019.09-dev/fpm-alpine/cron.sh mode change 100644 => 100755 2019.09-dev/fpm-alpine/entrypoint.sh mode change 100644 => 100755 2019.09-dev/fpm/cron.sh mode change 100644 => 100755 2019.09-dev/fpm/entrypoint.sh mode change 100644 => 100755 2019.09-rc/apache/cron.sh mode change 100644 => 100755 2019.09-rc/apache/entrypoint.sh mode change 100644 => 100755 2019.09-rc/fpm-alpine/cron.sh mode change 100644 => 100755 2019.09-rc/fpm-alpine/entrypoint.sh mode change 100644 => 100755 2019.09-rc/fpm/cron.sh mode change 100644 => 100755 2019.09-rc/fpm/entrypoint.sh mode change 100644 => 100755 docker-cron.sh mode change 100644 => 100755 docker-entrypoint.sh diff --git a/2019.06/apache/Dockerfile b/2019.06/apache/Dockerfile index cf00930..ae2a804 100644 --- a/2019.06/apache/Dockerfile +++ b/2019.06/apache/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:7.3-apache-stretch -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -45,9 +44,6 @@ RUN set -ex; \ curl \ libzip-dev \ ; \ - \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - \ docker-php-ext-configure gd \ --with-gd \ --with-freetype-dir=/usr/include/ \ @@ -98,7 +94,8 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -121,7 +118,8 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod rewrite remoteip ;\ +RUN set -ex;\ + a2enmod rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ @@ -150,7 +148,6 @@ RUN set -ex; \ COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/2019.06/apache/cron.sh b/2019.06/apache/cron.sh old mode 100644 new mode 100755 diff --git a/2019.06/apache/entrypoint.sh b/2019.06/apache/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.06/fpm-alpine/Dockerfile b/2019.06/fpm-alpine/Dockerfile index 11f9ef9..0bd49f7 100644 --- a/2019.06/fpm-alpine/Dockerfile +++ b/2019.06/fpm-alpine/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template FROM php:7.3-fpm-alpine -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -91,7 +90,8 @@ RUN set -ex; \ apk del .build-deps; # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -135,7 +135,6 @@ RUN set -ex; \ COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2019.06/fpm-alpine/cron.sh b/2019.06/fpm-alpine/cron.sh old mode 100644 new mode 100755 diff --git a/2019.06/fpm-alpine/entrypoint.sh b/2019.06/fpm-alpine/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.06/fpm/Dockerfile b/2019.06/fpm/Dockerfile index 0c68e68..85f57b9 100644 --- a/2019.06/fpm/Dockerfile +++ b/2019.06/fpm/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:7.3-fpm-stretch -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -45,9 +44,6 @@ RUN set -ex; \ curl \ libzip-dev \ ; \ - \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - \ docker-php-ext-configure gd \ --with-gd \ --with-freetype-dir=/usr/include/ \ @@ -98,7 +94,8 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -142,7 +139,6 @@ RUN set -ex; \ COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2019.06/fpm/cron.sh b/2019.06/fpm/cron.sh old mode 100644 new mode 100755 diff --git a/2019.06/fpm/entrypoint.sh b/2019.06/fpm/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.09-dev/apache/Dockerfile b/2019.09-dev/apache/Dockerfile index cb06a7e..bbf8c81 100644 --- a/2019.09-dev/apache/Dockerfile +++ b/2019.09-dev/apache/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:7.3-apache-stretch -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -45,9 +44,6 @@ RUN set -ex; \ curl \ libzip-dev \ ; \ - \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - \ docker-php-ext-configure gd \ --with-gd \ --with-freetype-dir=/usr/include/ \ @@ -98,7 +94,8 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -121,7 +118,8 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod rewrite remoteip ;\ +RUN set -ex;\ + a2enmod rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ @@ -136,7 +134,6 @@ ENV FRIENDICA_ADDONS 2019.09-dev COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/2019.09-dev/apache/cron.sh b/2019.09-dev/apache/cron.sh old mode 100644 new mode 100755 diff --git a/2019.09-dev/apache/entrypoint.sh b/2019.09-dev/apache/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.09-dev/fpm-alpine/Dockerfile b/2019.09-dev/fpm-alpine/Dockerfile index c49abb8..d8fd1c4 100644 --- a/2019.09-dev/fpm-alpine/Dockerfile +++ b/2019.09-dev/fpm-alpine/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template FROM php:7.3-fpm-alpine -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -91,7 +90,8 @@ RUN set -ex; \ apk del .build-deps; # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -121,7 +121,6 @@ ENV FRIENDICA_ADDONS 2019.09-dev COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2019.09-dev/fpm-alpine/cron.sh b/2019.09-dev/fpm-alpine/cron.sh old mode 100644 new mode 100755 diff --git a/2019.09-dev/fpm-alpine/entrypoint.sh b/2019.09-dev/fpm-alpine/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.09-dev/fpm/Dockerfile b/2019.09-dev/fpm/Dockerfile index 6529b9e..5bb4218 100644 --- a/2019.09-dev/fpm/Dockerfile +++ b/2019.09-dev/fpm/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:7.3-fpm-stretch -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -45,9 +44,6 @@ RUN set -ex; \ curl \ libzip-dev \ ; \ - \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - \ docker-php-ext-configure gd \ --with-gd \ --with-freetype-dir=/usr/include/ \ @@ -98,7 +94,8 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -128,7 +125,6 @@ ENV FRIENDICA_ADDONS 2019.09-dev COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2019.09-dev/fpm/cron.sh b/2019.09-dev/fpm/cron.sh old mode 100644 new mode 100755 diff --git a/2019.09-dev/fpm/entrypoint.sh b/2019.09-dev/fpm/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.09-rc/apache/Dockerfile b/2019.09-rc/apache/Dockerfile index ae82057..1d4c8c0 100644 --- a/2019.09-rc/apache/Dockerfile +++ b/2019.09-rc/apache/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:7.3-apache-stretch -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -45,9 +44,6 @@ RUN set -ex; \ curl \ libzip-dev \ ; \ - \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - \ docker-php-ext-configure gd \ --with-gd \ --with-freetype-dir=/usr/include/ \ @@ -98,7 +94,8 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -121,7 +118,8 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod rewrite remoteip ;\ +RUN set -ex;\ + a2enmod rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ @@ -136,7 +134,6 @@ ENV FRIENDICA_ADDONS 2019.09-rc COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/2019.09-rc/apache/cron.sh b/2019.09-rc/apache/cron.sh old mode 100644 new mode 100755 diff --git a/2019.09-rc/apache/entrypoint.sh b/2019.09-rc/apache/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.09-rc/fpm-alpine/Dockerfile b/2019.09-rc/fpm-alpine/Dockerfile index 162ff8d..7aa3a9a 100644 --- a/2019.09-rc/fpm-alpine/Dockerfile +++ b/2019.09-rc/fpm-alpine/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template FROM php:7.3-fpm-alpine -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -91,7 +90,8 @@ RUN set -ex; \ apk del .build-deps; # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -121,7 +121,6 @@ ENV FRIENDICA_ADDONS 2019.09-rc COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2019.09-rc/fpm-alpine/cron.sh b/2019.09-rc/fpm-alpine/cron.sh old mode 100644 new mode 100755 diff --git a/2019.09-rc/fpm-alpine/entrypoint.sh b/2019.09-rc/fpm-alpine/entrypoint.sh old mode 100644 new mode 100755 diff --git a/2019.09-rc/fpm/Dockerfile b/2019.09-rc/fpm/Dockerfile index 7eb72d2..13fca77 100644 --- a/2019.09-rc/fpm/Dockerfile +++ b/2019.09-rc/fpm/Dockerfile @@ -1,6 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:7.3-fpm-stretch -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -45,9 +44,6 @@ RUN set -ex; \ curl \ libzip-dev \ ; \ - \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - \ docker-php-ext-configure gd \ --with-gd \ --with-freetype-dir=/usr/include/ \ @@ -98,7 +94,8 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -128,7 +125,6 @@ ENV FRIENDICA_ADDONS 2019.09-rc COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2019.09-rc/fpm/cron.sh b/2019.09-rc/fpm/cron.sh old mode 100644 new mode 100755 diff --git a/2019.09-rc/fpm/entrypoint.sh b/2019.09-rc/fpm/entrypoint.sh old mode 100644 new mode 100755 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ffcbf40..0d3e003 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,5 +1,4 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%% -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -90,7 +89,8 @@ RUN set -ex; \ apk del .build-deps; # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -120,7 +120,6 @@ ENV FRIENDICA_ADDONS %%VERSION%% COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["%%CMD%%"] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 9311f12..16ad29c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,5 +1,4 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch -LABEL maintainer="Philipp Holzer " # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -44,9 +43,6 @@ RUN set -ex; \ curl \ libzip-dev \ ; \ - \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - \ docker-php-ext-configure gd \ --with-gd \ --with-freetype-dir=/usr/include/ \ @@ -97,7 +93,8 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -RUN { \ +RUN set -ex; \ + { \ echo 'opcache.enable=1' ; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=10000'; \ @@ -127,7 +124,6 @@ ENV FRIENDICA_ADDONS %%VERSION%% COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -RUN chmod +x /*.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["%%CMD%%"] diff --git a/docker-cron.sh b/docker-cron.sh old mode 100644 new mode 100755 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/update.sh b/update.sh index 669c0f6..52bac65 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ declare -A base=( ) declare -A extras=( - [apache]='\nRUN a2enmod rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip' + [apache]='\nRUN set -ex;\\\n a2enmod rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip' [fpm]='' [fpm-alpine]='' )