From e9706d0e4fe73c6c566ba49e1721c96269aa07ac Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Sun, 3 Nov 2019 17:20:12 +0200
Subject: [PATCH] Copy env file to dev deployment

---
 .gitlab-ci.yml     | 21 +--------------------
 docker-compose.yml |  2 +-
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec29b6e..ff18c9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,30 +77,11 @@ 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
+        - scp .env.dev $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/.env
         - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/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/deploy_dev.sh \"$IMAGE_NAME_DEV\""
 
-# deploy_production:
-#     stage: deploy
-#     image: alpine:latest
-#     environment:
-#         name: production
-#         url: https://sika.sahkoinsinoorikilta.fi
-#     when: manual
-#     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
-#         - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-#     script:
-#         - ssh $PROD_SSH_USER@$PROD_SSH_HOST "zsh ~/deploy.sh"
-
 deploy_production:
     stage: deploy
     image: docker:stable
diff --git a/docker-compose.yml b/docker-compose.yml
index 828dc1e..3a662a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend
     command: ["bash", "-c", "cd /app & bash setup.sh --no-input --no-npm && gunicorn -w 4 -b 0.0.0.0:8000 sikweb.wsgi"]
     env_file:
-      - .env.dev
+      - .env
     ports:
       - "8000:8000"
     depends_on: