Merge branch 'test-deploy' into 'master'

Add the deploy in reveiw and in staging

See merge request !1

Author: Administrator

.gitlab-ci.yml

@@ -7,13 +7,45 @@ deploy_staging:
   stage: deploy
   script:
     - export DOCKER_TLS_VERIFY="1"
-    - export DOCKER_HOST="tcp://192.168.99.103:2376"
+    - export DOCKER_HOST="tcp://manager.machine.local:2376"
     - export DOCKER_CERT_PATH="/.docker/machine/machines/manager1"
     - export DOCKER_MACHINE_NAME="manager1"
-    - docker stack deploy --compose-file docker-stack.yml vote
+    - docker stack deploy --compose-file docker-stack.yml voting-app
 
   environment:
     name: staging
-    url: http://192.168.99.103:5000
+    url: http://voting-app_vote.machine.local
+  only:
+  - master
+
+deploy_review:
+  stage: deploy
+  script:
+    - export DOCKER_TLS_VERIFY="1"
+    - export DOCKER_HOST="tcp://192.168.99.103:2376"
+    - export DOCKER_CERT_PATH="/.docker/machine/machines/manager1"
+    - export DOCKER_MACHINE_NAME="manager1"
+    - docker stack deploy --compose-file docker-stack.yml $CI_ENVIRONMENT_SLUG
+  environment:
+    name: review/$CI_BUILD_REF_NAME
+    url: http://${CI_ENVIRONMENT_SLUG}_vote.machine.local
+    on_stop: stop_review
   only:
-  - master
+    - branches
+  except:
+    - master
+
+stop_review:
+  stage: deploy
+  variables:
+    GIT_STRATEGY: none
+  script:
+    - export DOCKER_TLS_VERIFY="1"
+    - export DOCKER_HOST="tcp://192.168.99.103:2376"
+    - export DOCKER_CERT_PATH="/.docker/machine/machines/manager1"
+    - export DOCKER_MACHINE_NAME="manager1"
+    - docker stack deploy rm $CI_ENVIRONMENT_SLUG
+  when: manual
+  environment:
+    name: review/$CI_BUILD_REF_NAME
+    action: stop

docker-stack.yml

@@ -26,12 +26,16 @@ services:
   vote:
     image: dockersamples/examplevotingapp_vote:before
     ports:
-      - 5000:80
+      - "80"
     networks:
       - frontend
+      - traefik-net
     depends_on:
       - redis
     deploy:
+      labels:
+        - "traefik.port=80"
+        - "traefik.docker.network=traefik-net"
       replicas: 2
       update_config:
         parallelism: 2
@@ -40,12 +44,16 @@ services:
   result:
     image: dockersamples/examplevotingapp_result:before
     ports:
-      - 5001:80
+      - "80"
     networks:
       - backend
+      - traefik-net
     depends_on:
       - db
     deploy:
+      labels:
+        - "traefik.docker.network=traefik-net"
+        - "traefik.port=80"
       replicas: 1
       update_config:
         parallelism: 2
@@ -73,7 +81,7 @@ services:
   visualizer:
     image: dockersamples/visualizer:stable
     ports:
-      - "8080:8080"
+      - "8080"
     stop_grace_period: 1m30s
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
@@ -82,8 +90,11 @@ services:
         constraints: [node.role == manager]
 
 networks:
+  traefik-net:
+    external:
+      name: traefik-net
   frontend:
   backend:
-
+  
 volumes:
   db-data: