mirror of
https://github.com/friendica/docker
synced 2025-01-30 03:10:27 +01:00
Merge pull request #162 from nupplaphil/bug/root_cron
Execute cron as www-data
This commit is contained in:
GitHub
commit
c66c825e79
27 changed files with 198 additions and 130 deletions
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue