Merge branch 'master' of https://mygit.wmg.warwick.ac.uk/u5500327/wmgzon

.gitlab-ci.yml

@@ -2,10 +2,32 @@ variables:
     APPSECRET: "test"
     ENVIRON: "test"
     FILESTORE: "static/assets/img/products/"
+    DOCKER_HOST: tcp://docker:2375/
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
 
 pytest:
     stage: test
+    tags:
+        - python
     script:
         - cd /builds/u5500327/wmgzon
         - pip install -r requirements.txt
         - pytest
+
+deploy:
+    stage: deploy
+    tags:
+        - docker
+    image: docker:20.10.16
+    services:
+        - name: docker:20.10.16-dind
+          alias: docker
+    script:
+        - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+        - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
+        - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+        - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $CI_REGISTRY_IMAGE:latest
+        - docker push $CI_REGISTRY_IMAGE:latest
+    only:
+        - master

cicd/docker-compose.yml

@@ -1,8 +1,15 @@
 version: '3.8'
 services:
-    gitlab-runner:
+    gitlab-runner-python:
         image: gitlab/gitlab-runner:latest
         volumes:
-            - ./runner-data:/etc/gitlab-runner
+            - ./runner-data-python:/etc/gitlab-runner
+            - /var/run/docker.sock:/var/run/docker.sock
+        restart: unless-stopped
+
+    gitlab-runner-docker:
+        image: gitlab/gitlab-runner:latest
+        volumes:
+            - ./runner-data-docker:/etc/gitlab-runner
             - /var/run/docker.sock:/var/run/docker.sock
         restart: unless-stopped