diff --git a/README.md b/README.md index fb59ef1d3f7cb07f3ee8a9565840125d4674c19b..43b7848a6f03874fc6806714382ff7b3d12fd2e9 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 654f95afdb4512e800d1accbd610b3b7a0efb1e0..99a23ebb141f5d2eeab52202a0ea9e4b96c475eb 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