From 066b3a5e68dcde118fa7fa6f32e0c9e2c42b368a Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Thu, 26 Jul 2018 00:40:11 +0300
Subject: [PATCH] Own deployment folder for frontend

---
 .deploy_dev-frontend.sh | 2 +-
 .gitlab-ci.yml          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.deploy_dev-frontend.sh b/.deploy_dev-frontend.sh
index f3af06c..995f511 100644
--- a/.deploy_dev-frontend.sh
+++ b/.deploy_dev-frontend.sh
@@ -4,7 +4,7 @@ echo "Deploying to development."
 set -e
 set -x
 
-pushd deployment
+pushd deployment-frontend
 
 docker-compose -f docker-compose-frontend.yml down
 docker pull "$1"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ab37d1..f71f3f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,9 +70,9 @@ deploy_dev:
         - chmod 600 ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     script:
-        - scp docker-compose-frontend.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose-frontend.yml
-        - scp .deploy_dev-frontend.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/deploy_dev-frontend.sh
-        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev-frontend.sh \"$IMAGE_NAME\""
+        - scp docker-compose-frontend.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/docker-compose-frontend.yml
+        - scp .deploy_dev-frontend.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/deploy_dev-frontend.sh
+        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev-frontend.sh \"$IMAGE_NAME\""
 
 # deploy_production:
 #     stage: deploy