diff --git a/.env b/.env index a00b34c9376dad735668fd76751ef1992584f5d2..f6e8349ced7fa738225130c6013c2d1cbc4068e0 100644 --- a/.env +++ b/.env @@ -9,4 +9,4 @@ GROUP_ID=1000 # Group ID used in the Docker containers NODE_TAG=10 COMPOSER_VERSION=2.6.5 -FPMHOST="fpm:9000" \ No newline at end of file +FPM_HOST="fpm:9000" \ No newline at end of file diff --git a/build/nginx/Dockerfile b/build/nginx/Dockerfile index dd24c4c58e02abbc65bc1d90da3ed2ebec1879c2..85cd90c045d24afd89254fc536f4c4e553d9ee4a 100644 --- a/build/nginx/Dockerfile +++ b/build/nginx/Dockerfile @@ -2,7 +2,7 @@ FROM nginx:1.25.3 as development ARG USER_ID=1000 ARG GROUP_ID=1000 -ARG FPMHOST="fpm:9000" +ARG FPM_HOST="fpm:9000" RUN deluser nginx RUN addgroup --gid $GROUP_ID mgmaps && useradd -d /home/mgmaps -u $USER_ID -g $GROUP_ID -m -s /bin/bash mgmaps @@ -12,7 +12,7 @@ RUN cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime ADD ./build/nginx/config/nginx.conf /etc/nginx/nginx.conf RUN rm /etc/nginx/conf.d/default.conf ADD ./build/nginx/config/maps.conf /tmp/maps.conf -RUN envsubst '$FPMHOST' < /tmp/maps.conf > /etc/nginx/conf.d/maps.conf +RUN envsubst '$FPM_HOST' < /tmp/maps.conf > /etc/nginx/conf.d/maps.conf # Fix directories the root image is using RUN mkdir -p /var/cache/nginx/client_temp && \ diff --git a/docker-compose.yml b/docker-compose.yml index 02ae1752425dac848a5557b56bcd736d11fbe47b..3e6306d01aba552123a1088d11d0441832cbc83f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,13 +10,13 @@ services: args: USER: ${USER_ID} GROUP: ${GROUP_ID} - FPMHOST: ${FPMHOST} + FPM_HOST: ${FPM_HOST} image: ${IMAGE_NAME}/nginx:${IMAGE_TAG} ports: - 8080:80 working_dir: /html - # volumes: - # - ./app:/html + volumes: + - ./app:/html fpm: restart: unless-stopped build: @@ -27,7 +27,7 @@ services: GROUP: ${GROUP_ID} image: ${IMAGE_NAME}/fpm:${IMAGE_TAG} volumes: - # - ./app:/html + - ./app:/html - vendor:/html/vendor - bootstrap-cache:/html/bootstrap/cache assets: