Skip to content

Commit 5320260

Browse files
committed
Reverse Proxy Dockerfile: Use build args for image versions
Now staging and prod docker-compose files specify the image versions to be used inside the reverse-proxy image.
1 parent 9d7afd1 commit 5320260

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

docker-compose.prod.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ services:
4545
build:
4646
context: .
4747
dockerfile: docker/reverse_proxy/Dockerfile
48-
image: registry.gitlab.com/cache-rules/nerd_herder_ops/reverse_proxy:0.10
48+
args:
49+
FRONTEND_IMAGE: registry.gitlab.com/cache-rules/nerd_herder_ops/frontend:0.6
50+
BACKEND_IMAGE: registry.gitlab.com/cache-rules/nerd_herder_ops/nerd_herder:0.8
51+
image: registry.gitlab.com/cache-rules/nerd_herder_ops/reverse_proxy:0.11
4952
deploy:
5053
replicas: 1
5154
restart_policy:

docker-compose.staging.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ services:
4848
build:
4949
context: .
5050
dockerfile: docker/reverse_proxy/Dockerfile
51-
image: registry.gitlab.com/cache-rules/nerd_herder_ops/reverse_proxy:0.9-beta
51+
args:
52+
FRONTEND_IMAGE: registry.gitlab.com/cache-rules/nerd_herder_ops/frontend:0.6-beta
53+
BACKEND_IMAGE: registry.gitlab.com/cache-rules/nerd_herder_ops/nerd_herder:0.8-beta
54+
image: registry.gitlab.com/cache-rules/nerd_herder_ops/reverse_proxy:0.11-beta
5255
deploy:
5356
replicas: 1
5457
restart_policy:

docker/reverse_proxy/Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
FROM registry.gitlab.com/cache-rules/nerd_herder_ops/frontend:0.6 as frontend
1+
ARG FRONTEND_IMAGE=registry.gitlab.com/cache-rules/nerd_herder_ops/frontend:latest
2+
ARG BACKEND_IMAGE=registry.gitlab.com/cache-rules/nerd_herder_ops/nerd_herder:latest
3+
4+
FROM ${FRONTEND_IMAGE} as frontend
25
RUN yarn build
3-
FROM registry.gitlab.com/cache-rules/nerd_herder_ops/nerd_herder:0.8 as backend
6+
7+
FROM ${BACKEND_IMAGE} as backend
48
RUN SECRET_KEY=WORKAROUND_FOR_COLLECTSTATIC python manage.py collectstatic --no-input
9+
510
FROM abiosoft/caddy:1.0.0-no-stats
611

712
COPY --from=frontend /usr/src/nerd_herder/frontend/build /var/www/nerd_herder/

0 commit comments

Comments
 (0)