Skip to content

Commit 1d82922

Browse files
author
Julien Garcia Gonzalez
committed
test review
1 parent 04e874d commit 1d82922

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

.gitlab-ci.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,20 @@ deploy_staging:
1616
name: staging
1717
url: http://192.168.99.103:5000
1818
only:
19-
- master
19+
- master
20+
21+
deploy_review:
22+
stage: deploy
23+
script:
24+
- export DOCKER_TLS_VERIFY="1"
25+
- export DOCKER_HOST="tcp://192.168.99.103:2376"
26+
- export DOCKER_CERT_PATH="/.docker/machine/machines/manager1"
27+
- export DOCKER_MACHINE_NAME="manager1"
28+
- docker stack deploy --compose-file docker-stack.yml $CI_ENVIRONMENT_SLUG
29+
environment:
30+
name: review/$CI_BUILD_REF_NAME
31+
url: https://$CI_ENVIRONMENT_SLUG_vote.machine.local
32+
only:
33+
- branches
34+
except:
35+
- master

docker-stack.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,15 @@ services:
2626
vote:
2727
image: dockersamples/examplevotingapp_vote:before
2828
ports:
29-
- 5000:80
29+
- "80"
3030
networks:
3131
- frontend
32+
- traefik-net
3233
depends_on:
3334
- redis
3435
deploy:
36+
labels:
37+
- "traefik.port=80"
3538
replicas: 2
3639
update_config:
3740
parallelism: 2
@@ -40,12 +43,15 @@ services:
4043
result:
4144
image: dockersamples/examplevotingapp_result:before
4245
ports:
43-
- 5001:80
46+
- "80"
4447
networks:
4548
- backend
49+
- traefik-net
4650
depends_on:
4751
- db
4852
deploy:
53+
labels:
54+
- "traefik.port=80"
4955
replicas: 1
5056
update_config:
5157
parallelism: 2
@@ -73,7 +79,7 @@ services:
7379
visualizer:
7480
image: dockersamples/visualizer:stable
7581
ports:
76-
- "8080:8080"
82+
- "8080"
7783
stop_grace_period: 1m30s
7884
volumes:
7985
- "/var/run/docker.sock:/var/run/docker.sock"
@@ -82,8 +88,11 @@ services:
8288
constraints: [node.role == manager]
8389

8490
networks:
91+
traefik-net:
92+
external:
93+
name: traefik-net
8594
frontend:
8695
backend:
87-
96+
8897
volumes:
8998
db-data:

0 commit comments

Comments
 (0)