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

Execute cron as www-data

This commit is contained in:
Philipp Holzer 2021-09-03 21:13:29 +02:00
parent 9e9556d12c
commit ee990e4837
No known key found for this signature in database
GPG Key ID: 9A28B7D4FF5667BD
27 changed files with 198 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
2021.04/apache/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.04/apache/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

28
2021.04/fpm-alpine/Dockerfile
View File

@ -11,6 +11,34 @@ RUN set -ex; \
shadow \
tini;
ENV GOSU_VERSION 1.14
RUN set -eux; \
\
apk add --no-cache --virtual .gosu-deps \
ca-certificates \
dpkg \
gnupg \
; \
\
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
\
# verify the signature
export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
\
# clean up fetch dependencies
apk del --no-network .gosu-deps; \
\
chmod +x /usr/local/bin/gosu; \
# verify that the binary works
gosu --version; \
gosu nobody true
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.04/fpm-alpine/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

18
2021.04/fpm/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.04/fpm/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

18
2021.07/apache/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.07/apache/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

28
2021.07/fpm-alpine/Dockerfile
View File

@ -11,6 +11,34 @@ RUN set -ex; \
shadow \
tini;
ENV GOSU_VERSION 1.14
RUN set -eux; \
\
apk add --no-cache --virtual .gosu-deps \
ca-certificates \
dpkg \
gnupg \
; \
\
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
\
# verify the signature
export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
\
# clean up fetch dependencies
apk del --no-network .gosu-deps; \
\
chmod +x /usr/local/bin/gosu; \
# verify that the binary works
gosu --version; \
gosu nobody true
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.07/fpm-alpine/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

18
2021.07/fpm/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.07/fpm/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

18
2021.09-dev/apache/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.09-dev/apache/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

28
2021.09-dev/fpm-alpine/Dockerfile
View File

@ -11,6 +11,34 @@ RUN set -ex; \
shadow \
tini;
ENV GOSU_VERSION 1.14
RUN set -eux; \
\
apk add --no-cache --virtual .gosu-deps \
ca-certificates \
dpkg \
gnupg \
; \
\
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
\
# verify the signature
export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
\
# clean up fetch dependencies
apk del --no-network .gosu-deps; \
\
chmod +x /usr/local/bin/gosu; \
# verify that the binary works
gosu --version; \
gosu nobody true
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.09-dev/fpm-alpine/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

18
2021.09-dev/fpm/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.09-dev/fpm/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

18
2021.09-rc/apache/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.09-rc/apache/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

28
2021.09-rc/fpm-alpine/Dockerfile
View File

@ -11,6 +11,34 @@ RUN set -ex; \
shadow \
tini;
ENV GOSU_VERSION 1.14
RUN set -eux; \
\
apk add --no-cache --virtual .gosu-deps \
ca-certificates \
dpkg \
gnupg \
; \
\
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
\
# verify the signature
export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
\
# clean up fetch dependencies
apk del --no-network .gosu-deps; \
\
chmod +x /usr/local/bin/gosu; \
# verify that the binary works
gosu --version; \
gosu nobody true
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.09-rc/fpm-alpine/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

18
2021.09-rc/fpm/Dockerfile
View File

@ -11,22 +11,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v0.19.0
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
2021.09-rc/fpm/cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi

28
Dockerfile-alpine.template
View File

@ -10,6 +10,34 @@ RUN set -ex; \
shadow \
tini;
ENV GOSU_VERSION 1.14
RUN set -eux; \
\
apk add --no-cache --virtual .gosu-deps \
ca-certificates \
dpkg \
gnupg \
; \
\
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
\
# verify the signature
export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
\
# clean up fetch dependencies
apk del --no-network .gosu-deps; \
\
chmod +x /usr/local/bin/gosu; \
# verify that the binary works
gosu --version; \
gosu nobody true
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

18
Dockerfile-debian.template
View File

@ -10,22 +10,14 @@ RUN set -ex; \
git \
# For mail() support
msmtp \
# For tini installation
gnupg dirmngr \
tini \
# For setuid/setgid support
gosu \
; \
# Verify that the binary works
gosu nobody true; \
rm -rf /var/lib/apt/lists/*;
# Add tini for reaping processes
ENV TINI_VERSION v%%TINI_VERSION%%
RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
&& mkdir ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
&& curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
&& gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
&& gpg --batch --verify /tini.asc /sbin/tini \
&& chmod +x /sbin/tini
# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
RUN set -ex; \

2
docker-cron.sh
View File

@ -8,7 +8,7 @@ done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if php /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
sh /setup_msmtp.sh
exec /sbin/tini -- php /var/www/html/bin/daemon.php -f start
exec gosu www-data:www-data tini -- php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
fi