From d7e896e84ddf7ef17abca404a6153e12f54434b6 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Wed, 15 Jul 2020 19:42:39 +0300
Subject: [PATCH] New DEV deploy script

---
 .gitlab-ci.yml | 53 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2a7ea1..4364c45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,27 +86,50 @@ publish:prod:
         - docker build . -f Dockerfile.prod -t "$IMAGE_NAME":prod
         - docker push "$IMAGE_NAME":prod
 
+# deploy:dev:
+#     stage: deploy
+#     image: alpine:latest
+#     environment:
+#         name: dev
+#         url: http://web.sik.party:3000
+#     only:
+#         - master
+#     before_script:
+#         - pwd
+#         - apk add --update openssh
+#         - ssh -V
+#         - mkdir -p ~/.ssh
+#         - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+#         - chmod 600 ~/.ssh/id_rsa
+#         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+#     script:
+#         - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/docker-compose.yml
+#         - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/deploy_dev.sh
+#         - ssh $DEV_SSH_USER@$DEV_SSH_HOST "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
+#         - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev.sh \"$IMAGE_NAME:latest\""
+
 deploy:dev:
     stage: deploy
-    image: alpine:latest
-    environment:
-        name: dev
-        url: http://web.sik.party:3000
+    image: docker:stable
     only:
         - master
+    environment:
+        name: dev
+        url: dev.sik.party
+    when: manual
+    variables:
+        DOCKER_HOST: $DEV_CI_DOCKER_HOST
+        DOCKER_TLS_VERIFY: 1
     before_script:
-        - pwd
-        - apk add --update openssh
-        - ssh -V
-        - mkdir -p ~/.ssh
-        - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
-        - chmod 600 ~/.ssh/id_rsa
-        - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+        - mkdir -p ~/.docker
+        - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
+        - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
+        - echo "$DEV_TLSKEY" > ~/.docker/key.pem
+        - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY"
     script:
-        - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/docker-compose.yml
-        - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/deploy_dev.sh
-        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
-        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev.sh \"$IMAGE_NAME:latest\""
+        - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME"
+    after_script:
+        - docker logout "$CI_REGISTRY"
 
 deploy:prod:
     stage: deploy