From 1de98c32dd46a2b433cc4041dc0c41c3ca5cf2b2 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 30 Nov 2023 15:45:28 +0100
Subject: [PATCH] fix host variable name
---
.env | 2 +-
build/nginx/Dockerfile | 4 ++--
docker-compose.yml | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.env b/.env
index a00b34c..f6e8349 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 dd24c4c..85cd90c 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 02ae175..3e6306d 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:
--
GitLab