Upgrade Dockerfile

Dockerfile

@@ -4,60 +4,66 @@
 
 
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
-ARG PHP_VERSION=7.3
-ARG NGINX_VERSION=1.15
-
+ARG PHP_VERSION=7.4
+ARG NGINX_VERSION=1.17
 
 # "php" stage
-FROM php:${PHP_VERSION}-fpm-alpine AS symfony_docker_php
+FROM php:${PHP_VERSION}-fpm-alpine AS symfony_php
 
 # persistent / runtime deps
 RUN apk add --no-cache \
-	acl \
-	file \
-	gettext \
-	git \
-	jq \
-	;
+        acl \
+        fcgi \
+        file \
+        gettext \
+        git \
+        jq \
+    ;
 
-ARG APCU_VERSION=5.1.17
+ARG APCU_VERSION=5.1.18
 RUN set -eux; \
 	apk add --no-cache --virtual .build-deps \
-	$PHPIZE_DEPS \
-	icu-dev \
-	libzip-dev \
-	postgresql-dev \
-	zlib-dev \
+	    $PHPIZE_DEPS \
+	    icu-dev \
+	    libzip-dev \
+	    zlib-dev \
 	; \
 	\
 	docker-php-ext-configure zip --with-libzip; \
 	docker-php-ext-install -j$(nproc) \
-	intl \
-	zip \
+	    intl \
+	    zip \
 	; \
 	pecl install \
-	apcu-${APCU_VERSION} \
+	    apcu-${APCU_VERSION} \
 	; \
 	pecl clear-cache; \
 	docker-php-ext-enable \
-	apcu \
-	opcache \
+	    apcu \
+	    opcache \
 	; \
 	\
 	runDeps="$( \
-	scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
-	| tr ',' '\n' \
-	| sort -u \
-	| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+	    scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+	        | tr ',' '\n' \
+	        | sort -u \
+	        | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)"; \
 	apk add --no-cache --virtual .phpexts-rundeps $runDeps; \
 	\
 	apk del .build-deps
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
 RUN ln -s $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini
 COPY docker/php/conf.d/symfony.ini $PHP_INI_DIR/conf.d/symfony.ini
 
+RUN set -eux; \
+	{ \
+		echo '[www]'; \
+		echo 'ping.path = /ping'; \
+	} | tee /usr/local/etc/php-fpm.d/docker-healthcheck.conf
+
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
 ENV COMPOSER_ALLOW_SUPERUSER=1
 # install Symfony Flex globally to speed up download of Composer packages (parallelized prefetching)
@@ -79,7 +85,7 @@ ENV STABILITY ${STABILITY:-stable}
 ARG SYMFONY_VERSION=""
 
 # Download the Symfony skeleton and leverage Docker cache layers
-RUN composer create-project "symfony/skeleton ${SYMFONY_VERSION}" . --stability=$STABILITY --prefer-dist --no-dev --no-progress --no-scripts --no-plugins --no-interaction; \
+RUN composer create-project "symfony/skeleton ${SYMFONY_VERSION}" . --stability=$STABILITY --prefer-dist --no-dev --no-progress --no-scripts --no-interaction; \
 	composer clear-cache
 
 ###> recipes ###
@@ -93,6 +99,11 @@ RUN set -eux; \
 	composer run-script --no-dev post-install-cmd; sync
 VOLUME /srv/app/var
 
+COPY docker/php/docker-healthcheck.sh /usr/local/bin/docker-healthcheck
+RUN chmod +x /usr/local/bin/docker-healthcheck
+
+HEALTHCHECK --interval=10s --timeout=3s --retries=3 CMD ["docker-healthcheck"]
+
 COPY docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint
 
@@ -102,16 +113,16 @@ CMD ["php-fpm"]
 
 # "nginx" stage
 # depends on the "php" stage above
-FROM nginx:${NGINX_VERSION}-alpine AS symfony_docker_nginx
+FROM nginx:${NGINX_VERSION}-alpine AS symfony_nginx
 
 COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
 WORKDIR /srv/app
 
-COPY --from=symfony_docker_php /srv/app/public public/
+COPY --from=symfony_php /srv/app/public public/
 
 # "h2-proxy-cert" stage
-FROM alpine:latest AS symfony_docker_h2-proxy-cert
+FROM alpine:latest AS symfony_h2-proxy-cert
 
 RUN apk add --no-cache openssl
 
@@ -124,8 +135,8 @@ RUN openssl req -new -passout pass:NotSecure -key server.key -out server.csr \
 RUN openssl x509 -req -sha256 -days 365 -in server.csr -signkey server.key -out server.crt
 
 ### "h2-proxy" stage
-FROM nginx:${NGINX_VERSION}-alpine AS symfony_docker_h2-proxy
+FROM nginx:${NGINX_VERSION}-alpine AS symfony_h2-proxy
 
 RUN mkdir -p /etc/nginx/ssl/
-COPY --from=symfony_docker_h2-proxy-cert server.key server.crt /etc/nginx/ssl/
+COPY --from=symfony_h2-proxy-cert server.key server.crt /etc/nginx/ssl/
 COPY ./docker/h2-proxy/default.conf /etc/nginx/conf.d/default.conf