From 83507a0d576a69fab803cacc6a74d718d803041f Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Wed, 13 Mar 2019 20:50:51 +1100
Subject: [PATCH] run dev and test as appropriate

---
 .gitlab-ci.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b296d29..ea92bb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,18 +22,28 @@ build:
 deploy_test:
   stage: deploy
   only:
-    - testing@hpc-team/strudelv2_spa
+    - test@hpc-team/strudelv2_spa
   tags: 
     - deploy_test
+  variables:
+    DOCKER_HOST: unix:///var/run/docker.sock
   script:
-    - echo "deploying test"
+    - echo "deploying dev"
+    - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
+    - docker stop strudel2_backend || echo "Failed to stop existing container"
+    - docker ps -a -q | xargs -I{} docker rm  {} || echo "No containers to remove"
+    - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
+    - docker pull l1ll1/strudel2_backend:latest
+    - docker run -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:latest || echo "Unable to start image ... possibly the old wsgi process is still running?"
   dependencies:
     - build
 
 deploy_dev:
   stage: deploy
+  only:
+    - dev@hpc-team/strudelv2_spa
   tags: 
-    - deploy_test
+    - deploy_dev
   variables:
     DOCKER_HOST: unix:///var/run/docker.sock
   script:
-- 
GitLab