From 5f33a99e18666ad19b60c044bea71655e78fe83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Mon, 8 Jul 2024 14:28:32 +0200
Subject: [PATCH] Simplify a bit the docker-compose.yml file

---
 infrastructure/docker/docker-compose.yml      | 2 --
 infrastructure/docker/services/php/Dockerfile | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/infrastructure/docker/docker-compose.yml b/infrastructure/docker/docker-compose.yml
index 67b3d09..76850f1 100644
--- a/infrastructure/docker/docker-compose.yml
+++ b/infrastructure/docker/docker-compose.yml
@@ -19,8 +19,6 @@ services:
             - postgres
         volumes:
             - "../..:/var/www:cached"
-        environment:
-            - "PHP_VERSION=${PHP_VERSION}"
         profiles:
             - default
         labels:
diff --git a/infrastructure/docker/services/php/Dockerfile b/infrastructure/docker/services/php/Dockerfile
index 546c1a6..7fa3e1f 100644
--- a/infrastructure/docker/services/php/Dockerfile
+++ b/infrastructure/docker/services/php/Dockerfile
@@ -52,7 +52,10 @@ RUN addgroup --gid $USER_ID app && \
 # Configuration
 COPY base/php-configuration /etc/php/${PHP_VERSION}
 
+ENV PHP_VERSION=${PHP_VERSION}
+
 WORKDIR /var/www
+
 ENTRYPOINT [ "/entrypoint" ]
 
 FROM php-base as frontend