Merge pull request #1679 from PyRowMan/dockerfilev2

Fix healthcheck failing when not using 80 default port

Dockerfile

@@ -2,7 +2,7 @@
 FROM composer:latest AS composer-base
 FROM dunglas/frankenphp:1-php8.3
 LABEL maintainer="PyRowMan"
-ENV SERVER_NAME=:80
+ENV SERVER_NAME=:${APP_PORT:-80}
 ARG MYSQL_CLIENT="mariadb-client"
 ARG SEVENZIP_VERSION=2407
 
@@ -65,7 +65,7 @@ RUN chmod -R 777 /app/storage/
 RUN chmod -R 777 /app/resources/
 RUN chmod -R 777 /app/public/
 
-EXPOSE 80
+EXPOSE ${APP_PORT:-80}
 
 CMD ["--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
 ENTRYPOINT ["docker-entrypoint"]

docker-compose.yml

@@ -11,7 +11,7 @@ services:
         environment:
             TZ: ${APP_TIMEZONE}
         healthcheck:
-          test: [ "CMD", "curl", "-f", "http://localhost:80" ]
+          test: [ "CMD", "curl", "-f", "http://localhost:${APP_PORT:-80}" ]
           interval: 10s
           timeout: 5s
           retries: 5