Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MetaGerMaps
Frontend
Commits
1de98c32
Commit
1de98c32
authored
1 year ago
by
Dominik Hebeler
Browse files
Options
Downloads
Patches
Plain Diff
fix host variable name
parent
e2d97832
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.env
+1
-1
1 addition, 1 deletion
.env
build/nginx/Dockerfile
+2
-2
2 additions, 2 deletions
build/nginx/Dockerfile
docker-compose.yml
+4
-4
4 additions, 4 deletions
docker-compose.yml
with
7 additions
and
7 deletions
.env
+
1
−
1
View file @
1de98c32
...
@@ -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
This diff is collapsed.
Click to expand it.
build/nginx/Dockerfile
+
2
−
2
View file @
1de98c32
...
@@ -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
&&
\
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
4
−
4
View file @
1de98c32
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment