friendica
/
docker
mirror of https://github.com/friendica/docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Fixings for offical-images 

- Fixed *.sh mode
- Removed label
- Fixed RUN settings
- Removed superfluous debMultiarch
This commit is contained in:
Philipp Holzer 2019-08-25 22:58:48 +02:00
parent bfb81571ec
commit 43eefc24ff
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
32 changed files with 29 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
2019.06/apache/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-apache-stretch FROM php:7.3-apache-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -45,9 +44,6 @@ RUN set -ex; \
curl \ curl \
libzip-dev \ libzip-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -98,7 +94,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -121,7 +118,8 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
RUN a2enmod rewrite remoteip ;\ RUN set -ex;\
a2enmod rewrite remoteip ;\
{\ {\
echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
@ -150,7 +148,6 @@ RUN set -ex; \
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

0
2019.06/apache/cron.sh Normal file → Executable file
View File

0
2019.06/apache/entrypoint.sh Normal file → Executable file
View File

5
2019.06/fpm-alpine/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.3-fpm-alpine FROM php:7.3-fpm-alpine
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -91,7 +90,8 @@ RUN set -ex; \
apk del .build-deps; apk del .build-deps;
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -135,7 +135,6 @@ RUN set -ex; \
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
2019.06/fpm-alpine/cron.sh Normal file → Executable file
View File

0
2019.06/fpm-alpine/entrypoint.sh Normal file → Executable file
View File

8
2019.06/fpm/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-fpm-stretch FROM php:7.3-fpm-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -45,9 +44,6 @@ RUN set -ex; \
curl \ curl \
libzip-dev \ libzip-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -98,7 +94,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -142,7 +139,6 @@ RUN set -ex; \
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
2019.06/fpm/cron.sh Normal file → Executable file
View File

0
2019.06/fpm/entrypoint.sh Normal file → Executable file
View File

11
2019.09-dev/apache/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-apache-stretch FROM php:7.3-apache-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -45,9 +44,6 @@ RUN set -ex; \
curl \ curl \
libzip-dev \ libzip-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -98,7 +94,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -121,7 +118,8 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
RUN a2enmod rewrite remoteip ;\ RUN set -ex;\
a2enmod rewrite remoteip ;\
{\ {\
echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
@ -136,7 +134,6 @@ ENV FRIENDICA_ADDONS 2019.09-dev
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

0
2019.09-dev/apache/cron.sh Normal file → Executable file
View File

0
2019.09-dev/apache/entrypoint.sh Normal file → Executable file
View File

5
2019.09-dev/fpm-alpine/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.3-fpm-alpine FROM php:7.3-fpm-alpine
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -91,7 +90,8 @@ RUN set -ex; \
apk del .build-deps; apk del .build-deps;
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -121,7 +121,6 @@ ENV FRIENDICA_ADDONS 2019.09-dev
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
2019.09-dev/fpm-alpine/cron.sh Normal file → Executable file
View File

0
2019.09-dev/fpm-alpine/entrypoint.sh Normal file → Executable file
View File

8
2019.09-dev/fpm/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-fpm-stretch FROM php:7.3-fpm-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -45,9 +44,6 @@ RUN set -ex; \
curl \ curl \
libzip-dev \ libzip-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -98,7 +94,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -128,7 +125,6 @@ ENV FRIENDICA_ADDONS 2019.09-dev
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
2019.09-dev/fpm/cron.sh Normal file → Executable file
View File

0
2019.09-dev/fpm/entrypoint.sh Normal file → Executable file
View File

11
2019.09-rc/apache/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-apache-stretch FROM php:7.3-apache-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -45,9 +44,6 @@ RUN set -ex; \
curl \ curl \
libzip-dev \ libzip-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -98,7 +94,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -121,7 +118,8 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
RUN a2enmod rewrite remoteip ;\ RUN set -ex;\
a2enmod rewrite remoteip ;\
{\ {\
echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
@ -136,7 +134,6 @@ ENV FRIENDICA_ADDONS 2019.09-rc
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

0
2019.09-rc/apache/cron.sh Normal file → Executable file
View File

0
2019.09-rc/apache/entrypoint.sh Normal file → Executable file
View File

5
2019.09-rc/fpm-alpine/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.3-fpm-alpine FROM php:7.3-fpm-alpine
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -91,7 +90,8 @@ RUN set -ex; \
apk del .build-deps; apk del .build-deps;
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -121,7 +121,6 @@ ENV FRIENDICA_ADDONS 2019.09-rc
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
2019.09-rc/fpm-alpine/cron.sh Normal file → Executable file
View File

0
2019.09-rc/fpm-alpine/entrypoint.sh Normal file → Executable file
View File

8
2019.09-rc/fpm/Dockerfile
View File

@ -1,6 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-fpm-stretch FROM php:7.3-fpm-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -45,9 +44,6 @@ RUN set -ex; \
curl \ curl \
libzip-dev \ libzip-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -98,7 +94,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -128,7 +125,6 @@ ENV FRIENDICA_ADDONS 2019.09-rc
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
2019.09-rc/fpm/cron.sh Normal file → Executable file
View File

0
2019.09-rc/fpm/entrypoint.sh Normal file → Executable file
View File

5
Dockerfile-alpine.template
View File

@ -1,5 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%% FROM php:%%PHP_VERSION%%-%%VARIANT%%
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -90,7 +89,8 @@ RUN set -ex; \
apk del .build-deps; apk del .build-deps;
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -120,7 +120,6 @@ ENV FRIENDICA_ADDONS %%VERSION%%
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

8
Dockerfile-debian.template
View File

@ -1,5 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -44,9 +43,6 @@ RUN set -ex; \
curl \ curl \
libzip-dev \ libzip-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -97,7 +93,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings # set recommended PHP.ini settings
RUN { \ RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \ echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \ echo 'opcache.max_accelerated_files=10000'; \
@ -127,7 +124,6 @@ ENV FRIENDICA_ADDONS %%VERSION%%
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/ COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

0
docker-cron.sh Normal file → Executable file
View File

0
docker-entrypoint.sh Normal file → Executable file
View File

2
update.sh
View File

@ -18,7 +18,7 @@ declare -A base=(
) )
declare -A extras=( 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]=''
[fpm-alpine]='' [fpm-alpine]=''
) )