From 3c552bb5d412b5cc90eacdef912dce80a893419e Mon Sep 17 00:00:00 2001
From: Thomas  MENARD <thomas.menard@pasteur.fr>
Date: Tue, 11 Jun 2019 10:12:02 +0200
Subject: [PATCH] Update CI to use K8s runner

---
 README.md               | 8 ++++++++
 solution/.gitlab-ci.yml | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/README.md b/README.md
index fb59ef1..43b7848 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,9 @@ stages:
   - build
   - deploy
 
+variables:
+  DOCKER_HOST: tcp://localhost:2375/
+
 services:
   - docker:dind
 
@@ -123,6 +126,8 @@ build:
     - docker build -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}" .
     - docker tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}" "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:latest"
     - docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}"
+  tags:
+    - k8s
 ```
 
 Save, commit and push; you should be abble to see your first running pipeline
@@ -470,6 +475,9 @@ deploy:
     - kubectl wait --for=condition=complete --timeout=600s job/polls-migrations
     - envsubst < polls.yaml | kubectl apply -n ${NAMESPACE} -f -
     - kubectl patch deployment polls -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}"
+  tags:
+    - k8s
+
 ```
 
 ### Take a look at your Gitlab CI pipeline
diff --git a/solution/.gitlab-ci.yml b/solution/.gitlab-ci.yml
index 654f95a..99a23eb 100644
--- a/solution/.gitlab-ci.yml
+++ b/solution/.gitlab-ci.yml
@@ -2,6 +2,9 @@ stages:
   - build
   - deploy
 
+variables:
+  DOCKER_HOST: tcp://localhost:2375/
+
 services:
   - docker:dind
 
@@ -13,6 +16,8 @@ build:
     - docker build -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}" .
     - docker tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}" "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:latest"
     - docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}"
+  tags:
+    - k8s
 
 deploy:
   stage: deploy
@@ -32,3 +37,5 @@ deploy:
     - kubectl wait --for=condition=complete --timeout=600s job/polls-migrations
     - envsubst < polls.yaml | kubectl apply -n ${NAMESPACE} -f -
     - kubectl patch deployment polls -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}"
+  tags:
+    - k8s
-- 
GitLab