Skip to content

Fixings for offical-images #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrPetovan merged 2 commits into from
Aug 26, 2019
Merged

Fixings for offical-images #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43eefc2
Fixings for offical-images
nupplaphil Aug 25, 2019
e28d6a7
Removed unnecessary release channel
nupplaphil Aug 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions 2019.06/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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/ \
Expand Down Expand Up @@ -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'; \
Expand All @@ -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 ;\
Expand Down Expand Up @@ -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"]
Empty file modified 2019.06/apache/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.06/apache/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
5 changes: 2 additions & 3 deletions 2019.06/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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"]
Empty file modified 2019.06/fpm-alpine/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.06/fpm-alpine/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 2 additions & 6 deletions 2019.06/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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/ \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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"]
Empty file modified 2019.06/fpm/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.06/fpm/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
11 changes: 4 additions & 7 deletions 2019.09-dev/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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/ \
Expand Down Expand Up @@ -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'; \
Expand All @@ -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 ;\
Expand All @@ -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"]
Empty file modified 2019.09-dev/apache/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.09-dev/apache/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
5 changes: 2 additions & 3 deletions 2019.09-dev/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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"]
Empty file modified 2019.09-dev/fpm-alpine/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.09-dev/fpm-alpine/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 2 additions & 6 deletions 2019.09-dev/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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/ \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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"]
Empty file modified 2019.09-dev/fpm/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.09-dev/fpm/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
11 changes: 4 additions & 7 deletions 2019.09-rc/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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/ \
Expand Down Expand Up @@ -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'; \
Expand All @@ -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 ;\
Expand All @@ -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"]
Empty file modified 2019.09-rc/apache/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.09-rc/apache/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
5 changes: 2 additions & 3 deletions 2019.09-rc/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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"]
Empty file modified 2019.09-rc/fpm-alpine/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.09-rc/fpm-alpine/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 2 additions & 6 deletions 2019.09-rc/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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/ \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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"]
Empty file modified 2019.09-rc/fpm/cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified 2019.09-rc/fpm/entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
5 changes: 2 additions & 3 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%
LABEL maintainer="Philipp Holzer <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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%%"]
8 changes: 2 additions & 6 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch
LABEL maintainer="Philipp Holzer <[email protected]>"

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -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/ \
Expand Down Expand Up @@ -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'; \
Expand Down Expand Up @@ -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%%"]
Empty file modified docker-cron.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified docker-entrypoint.sh
100644 → 100755
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
set -Eeuo pipefail

declare -A release_channel=(
[production]='2019.06'
[stable]='2019.06'
[latest]='2019.06'
)
Expand Down
2 changes: 1 addition & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]=''
)
Expand Down