fix: add symlink for old caddy location

shopware · Jan 22, 2024 · 46a1093 · 46a1093
1 parent c5f973f
commit 46a1093
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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