Skip to content
Snippets Groups Projects
Commit 1de98c32 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

fix host variable name

parent e2d97832
No related branches found
No related tags found
No related merge requests found
...@@ -9,4 +9,4 @@ GROUP_ID=1000 # Group ID used in the Docker containers ...@@ -9,4 +9,4 @@ GROUP_ID=1000 # Group ID used in the Docker containers
NODE_TAG=10 NODE_TAG=10
COMPOSER_VERSION=2.6.5 COMPOSER_VERSION=2.6.5
FPMHOST="fpm:9000" FPM_HOST="fpm:9000"
\ No newline at end of file \ No newline at end of file
...@@ -2,7 +2,7 @@ FROM nginx:1.25.3 as development ...@@ -2,7 +2,7 @@ FROM nginx:1.25.3 as development
ARG USER_ID=1000 ARG USER_ID=1000
ARG GROUP_ID=1000 ARG GROUP_ID=1000
ARG FPMHOST="fpm:9000" ARG FPM_HOST="fpm:9000"
RUN deluser nginx RUN deluser nginx
RUN addgroup --gid $GROUP_ID mgmaps && useradd -d /home/mgmaps -u $USER_ID -g $GROUP_ID -m -s /bin/bash mgmaps 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 ...@@ -12,7 +12,7 @@ RUN cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime
ADD ./build/nginx/config/nginx.conf /etc/nginx/nginx.conf ADD ./build/nginx/config/nginx.conf /etc/nginx/nginx.conf
RUN rm /etc/nginx/conf.d/default.conf RUN rm /etc/nginx/conf.d/default.conf
ADD ./build/nginx/config/maps.conf /tmp/maps.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 # Fix directories the root image is using
RUN mkdir -p /var/cache/nginx/client_temp && \ RUN mkdir -p /var/cache/nginx/client_temp && \
......
...@@ -10,13 +10,13 @@ services: ...@@ -10,13 +10,13 @@ services:
args: args:
USER: ${USER_ID} USER: ${USER_ID}
GROUP: ${GROUP_ID} GROUP: ${GROUP_ID}
FPMHOST: ${FPMHOST} FPM_HOST: ${FPM_HOST}
image: ${IMAGE_NAME}/nginx:${IMAGE_TAG} image: ${IMAGE_NAME}/nginx:${IMAGE_TAG}
ports: ports:
- 8080:80 - 8080:80
working_dir: /html working_dir: /html
# volumes: volumes:
# - ./app:/html - ./app:/html
fpm: fpm:
restart: unless-stopped restart: unless-stopped
build: build:
...@@ -27,7 +27,7 @@ services: ...@@ -27,7 +27,7 @@ services:
GROUP: ${GROUP_ID} GROUP: ${GROUP_ID}
image: ${IMAGE_NAME}/fpm:${IMAGE_TAG} image: ${IMAGE_NAME}/fpm:${IMAGE_TAG}
volumes: volumes:
# - ./app:/html - ./app:/html
- vendor:/html/vendor - vendor:/html/vendor
- bootstrap-cache:/html/bootstrap/cache - bootstrap-cache:/html/bootstrap/cache
assets: assets:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment