From b5710da39cc9939c2eef4787ab50b4ee7d16e44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Mon, 18 Sep 2023 22:03:49 +0200
Subject: [PATCH] feat: better healthcheck and prevent useless composer install
 calls

---
 Dockerfile                      | 2 +-
 docker/caddy/Caddyfile          | 6 +-----
 docker/php/docker-entrypoint.sh | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1a4fd65..d2f2756 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -111,7 +111,7 @@ WORKDIR /srv/app
 ADD --chmod=500 https://caddyserver.com/api/download?os=linux&arch=$TARGETARCH&p=github.com/dunglas/mercure/caddy&p=github.com/dunglas/vulcain/caddy /usr/bin/caddy
 
 COPY --link docker/caddy/Caddyfile /etc/caddy/Caddyfile
-HEALTHCHECK CMD wget --no-verbose --tries=1 --spider https://localhost/healthz || exit 1
+HEALTHCHECK CMD wget --no-verbose --tries=1 --spider http://localhost:2019/metrics || exit 1
 
 # Prod Caddy image
 FROM caddy_base AS caddy_prod
diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile
index e506b7b..59690f6 100644
--- a/docker/caddy/Caddyfile
+++ b/docker/caddy/Caddyfile
@@ -2,7 +2,7 @@
 	{$CADDY_GLOBAL_OPTIONS}
 }
 
-{$SERVER_NAME:localhost} 
+{$SERVER_NAME:localhost}
 
 {$CADDY_EXTRA_CONFIG}
 
@@ -19,10 +19,6 @@ log {
 }
 
 route {
-	# Healthcheck URL
-	respond /healthz 200
-	skip_log /healthz
-
 	root * /srv/app/public
 	mercure {
 		# Transport to use (default to Bolt)
diff --git a/docker/php/docker-entrypoint.sh b/docker/php/docker-entrypoint.sh
index 4cbfee6..b9352f7 100755
--- a/docker/php/docker-entrypoint.sh
+++ b/docker/php/docker-entrypoint.sh
@@ -27,7 +27,7 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
 		fi
 	fi
 
-	if [ "$APP_ENV" != 'prod' ]; then
+	if [ ! -d 'vendor/' ]; then
 		composer install --prefer-dist --no-progress --no-interaction
 	fi