From efb1ee618286d0d183568aefc330ae43731770ce Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan-sebastian.tuomi@aalto.fi>
Date: Sun, 5 Nov 2017 10:38:39 +0200
Subject: [PATCH] Improve dev deployment

---
 .deploy_dev.sh | 19 +++++++++++++++++++
 .gitlab-ci.yml |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 .deploy_dev.sh

diff --git a/.deploy_dev.sh b/.deploy_dev.sh
new file mode 100644
index 0000000..9a82f6d
--- /dev/null
+++ b/.deploy_dev.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+echo "Deploying to development."
+set -e
+set -x
+
+pushd deployment
+
+docker-compose down
+docker pull "$1"
+docker-compose up -d
+docker container prune -f
+docker image prune -f
+docker volume prune -f
+
+popd
+
+set +x
+set +e
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5866bca..d5f033c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,8 @@ deploy_dev:
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     script:
         - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml
-        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "cd deployment && docker-compose down && docker pull \"$IMAGE_NAME\" && docker-compose up -d && docker container prune -f && docker image prune -f && docker volume prune -f"
+        - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/deploy_dev.sh
+        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh"
 
 deploy_production:
     stage: deploy