From 95e72b7ab2b583b143ab315eae081d06446cab85 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Tue, 8 Oct 2019 00:42:44 +0300
Subject: [PATCH 1/2] Add placeholder publish to fix dev server

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08fb765..58d85e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,13 +46,27 @@ remark:
     script:
         - npm run remark
 
-publish:
+# TODO: remove
+publish_dev:
     stage: publish
     image: docker:stable
     services:
         - docker:stable-dind
     only:
         - develop
+    script:
+        - docker info
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        - docker build . -t "$IMAGE_NAME_DEV"
+        - docker push "$IMAGE_NAME_DEV"
+
+publish:
+    stage: publish
+    image: docker:stable
+    services:
+        - docker:stable-dind
+    only:
+        - master
     script:
         - docker info
         - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -79,7 +93,7 @@ deploy_dev:
         - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml
         - 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\""
+        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh \"$IMAGE_NAME_DEV\""
 
 # deploy_production:
 #     stage: deploy
diff --git a/docker-compose.yml b/docker-compose.yml
index a42ae3d..6a7b964 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     image: postgres
   web:
     build: .
-    image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend
+    image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:dev
     command: ["bash", "-c", "cd /code && ./wait-for-it.sh db:5432 -- bash setup.sh --no-input --no-npm && python manage.py runserver 0.0.0.0:8000"]
     ports:
       - "8000:8000"

From 5d6cf1fb804be98dc1987dff3d2a9b011a713648 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Tue, 8 Oct 2019 00:46:37 +0300
Subject: [PATCH 2/2] =?UTF-8?q?Add=20execution=20rights=20to=20entry=20scr?=
 =?UTF-8?q?ip=C3=A5t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 production_entrypoint.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 production_entrypoint.sh

diff --git a/production_entrypoint.sh b/production_entrypoint.sh
old mode 100644
new mode 100755