8000 chore: move Caddy file to /etc/frankenphp · dunglas/symfony-docker@882c5a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 882c5a1

Browse files
dunglasdunglas
committed
chore: move Caddy file to /etc/frankenphp
1 parent 14797f3 commit 882c5a1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
4646

4747
COPY --link frankenphp/conf.d/10-app.ini $PHP_INI_DIR/app.conf.d/
4848
COPY --link --chmod=755 frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
49-
COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
49+
COPY --link frankenphp/Caddyfile /etc/frankenphp/Caddyfile
5050

5151
ENTRYPOINT ["docker-entrypoint"]
5252

5353
HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
54-
CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
54+
CMD [ "frankenphp", "run", "--config", "/etc/frankenphp/Caddyfile" ]
5555

5656
# Dev FrankenPHP image
5757
FROM frankenphp_base AS frankenphp_dev
@@ -69,7 +69,7 @@ RUN set -eux; \
6969

7070
COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
7171

72-
CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
72+
CMD [ "frankenphp", "run", "--config", "/etc/frankenphp/Caddyfile", "--watch" ]
7373

7474
# Prod FrankenPHP image
7575
FROM frankenphp_base AS frankenphp_prod

‎compose.override.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
target: frankenphp_dev
77
volumes:
88
- ./:/app
9-
- ./frankenphp/Caddyfile:/etc/caddy/Caddyfile:ro
9+
- ./frankenphp/Caddyfile:/etc/frankenphp/Caddyfile:ro
1010
- ./frankenphp/conf.d/20-app.dev.ini:/usr/local/etc/php/app.conf.d/20-app.dev.ini:ro
1111
# If you develop on Mac or Windows you can remove the vendor/ directory
1212
# from the bind-mount for better performance by enabling the next line:

0 commit comments

Comments
 (0)
0