File tree 3 files changed +15
-4
lines changed
3 files changed +15
-4
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,10 @@ services:
45
45
build :
46
46
context : .
47
47
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
49
52
deploy :
50
53
replicas : 1
51
54
restart_policy :
Original file line number Diff line number Diff line change @@ -48,7 +48,10 @@ services:
48
48
build :
49
49
context : .
50
50
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
52
55
deploy :
53
56
replicas : 1
54
57
restart_policy :
Original file line number Diff line number Diff line change 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
2
5
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
4
8
RUN SECRET_KEY=WORKAROUND_FOR_COLLECTSTATIC python manage.py collectstatic --no-input
9
+
5
10
FROM abiosoft/caddy:1.0.0-no-stats
6
11
7
12
COPY --from=frontend /usr/src/nerd_herder/frontend/build /var/www/nerd_herder/
You can’t perform that action at this time.
0 commit comments