From 46a1093f5af8af72a8a6add25b84939a76845fab Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Mon, 22 Jan 2024 13:05:25 +0100 Subject: [PATCH] fix: add symlink for old caddy location --- 8.0/Dockerfile | 3 ++- 8.1/Dockerfile | 3 ++- 8.2/Dockerfile | 3 ++- 8.3/Dockerfile | 3 ++- Dockerfile.template | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index ffea652..60dad9c 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -12,7 +12,8 @@ RUN apk add --no-cache icu-data-full curl jq caddy && \ mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \ rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \ rm -f /usr/local/etc/php-fpm.d/www.conf && \ - rm -f /usr/local/etc/php-fpm.d/www.conf.default + rm -f /usr/local/etc/php-fpm.d/www.conf.default && \ + ln -s /usr/sbin/caddy /usr/bin/caddy COPY --from=shyim/supervisord:latest@sha256:8671c375d4890f6592dcab242758427f47303b47b96fe31d86c949a496a9cda2 --link /usr/local/bin/supervisord /usr/bin/supervisord diff --git a/8.1/Dockerfile b/8.1/Dockerfile index fc24918..2b8d468 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -12,7 +12,8 @@ RUN apk add --no-cache icu-data-full curl jq caddy && \ mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \ rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \ rm -f /usr/local/etc/php-fpm.d/www.conf && \ - rm -f /usr/local/etc/php-fpm.d/www.conf.default + rm -f /usr/local/etc/php-fpm.d/www.conf.default && \ + ln -s /usr/sbin/caddy /usr/bin/caddy COPY --from=shyim/supervisord:latest@sha256:8671c375d4890f6592dcab242758427f47303b47b96fe31d86c949a496a9cda2 --link /usr/local/bin/supervisord /usr/bin/supervisord diff --git a/8.2/Dockerfile b/8.2/Dockerfile index d501a65..8657a3d 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -12,7 +12,8 @@ RUN apk add --no-cache icu-data-full curl jq caddy && \ mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \ rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \ rm -f /usr/local/etc/php-fpm.d/www.conf && \ - rm -f /usr/local/etc/php-fpm.d/www.conf.default + rm -f /usr/local/etc/php-fpm.d/www.conf.default && \ + ln -s /usr/sbin/caddy /usr/bin/caddy COPY --from=shyim/supervisord:latest@sha256:8671c375d4890f6592dcab242758427f47303b47b96fe31d86c949a496a9cda2 --link /usr/local/bin/supervisord /usr/bin/supervisord diff --git a/8.3/Dockerfile b/8.3/Dockerfile index bb79cb4..0e82bdd 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -12,7 +12,8 @@ RUN apk add --no-cache icu-data-full curl jq caddy && \ mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \ rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \ rm -f /usr/local/etc/php-fpm.d/www.conf && \ - rm -f /usr/local/etc/php-fpm.d/www.conf.default + rm -f /usr/local/etc/php-fpm.d/www.conf.default && \ + ln -s /usr/sbin/caddy /usr/bin/caddy COPY --from=shyim/supervisord:latest@sha256:8671c375d4890f6592dcab242758427f47303b47b96fe31d86c949a496a9cda2 --link /usr/local/bin/supervisord /usr/bin/supervisord diff --git a/Dockerfile.template b/Dockerfile.template index b663647..3ae4eec 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -12,7 +12,8 @@ RUN apk add --no-cache icu-data-full curl jq caddy && \ mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \ rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \ rm -f /usr/local/etc/php-fpm.d/www.conf && \ - rm -f /usr/local/etc/php-fpm.d/www.conf.default + rm -f /usr/local/etc/php-fpm.d/www.conf.default && \ + ln -s /usr/sbin/caddy /usr/bin/caddy COPY --from=shyim/supervisord:latest@${SUPERVISORD_DIGEST} --link /usr/local/bin/supervisord /usr/bin/supervisord