Skip to content

Commit 5a9785d

Browse files
committed
fix(docker): prevent BC break with the new Caddyfile path
1 parent c522b52 commit 5a9785d

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ RUN set -eux; \
1919
/app/public \
2020
/config/caddy \
2121
/data/caddy \
22+
/etc/caddy; \
2223
/etc/frankenphp; \
2324
sed -i 's/php/frankenphp run/g' /usr/local/bin/docker-php-entrypoint; \
2425
echo '<?php phpinfo();' > /app/public/index.php
2526

26-
COPY --link caddy/frankenphp/Caddyfile /etc/frankenphp/Caddyfile
27-
RUN curl -sSLf \
27+
COPY --link caddy/frankenphp/Caddyfile /etc/caddy/Caddyfile
28+
RUN ln /etc/caddy/Caddyfile /etc/frankenphp/Caddyfile && \
29+
curl -sSLf \
2830
-o /usr/local/bin/install-php-extensions \
2931
https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && \
3032
chmod +x /usr/local/bin/install-php-extensions

alpine.Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@ RUN set -eux; \
1818
/app/public \
1919
/config/caddy \
2020
/data/caddy \
21+
/etc/caddy \
2122
/etc/frankenphp; \
2223
sed -i 's/php/frankenphp run/g' /usr/local/bin/docker-php-entrypoint; \
2324
echo '<?php phpinfo();' > /app/public/index.php
2425

25-
COPY --link caddy/frankenphp/Caddyfile /etc/frankenphp/Caddyfile
26-
RUN curl -sSLf \
26+
COPY --link caddy/frankenphp/Caddyfile /etc/caddy/Caddyfile
27+
28+
RUN ln /etc/caddy/Caddyfile /etc/frankenphp/Caddyfile && \
29+
curl -sSLf \
2730
-o /usr/local/bin/install-php-extensions \
2831
https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && \
2932
chmod +x /usr/local/bin/install-php-extensions

0 commit comments

Comments
 (0)