From ecf6aca35615f14f04ff17b52ade1fc7cde13a9b Mon Sep 17 00:00:00 2001 From: Manuel Kieweg <manuel.kieweg@h-da.de> Date: Fri, 26 Mar 2021 18:36:14 +0000 Subject: [PATCH] docker image --- build/ci/.build-container.yml | 5 +++-- build/ci/.terraform-ci.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml index 2021ea035..ef2311b50 100644 --- a/build/ci/.build-container.yml +++ b/build/ci/.build-container.yml @@ -1,4 +1,3 @@ -image: docker:19.03.12 services: - docker:19.03.12-dind @@ -8,6 +7,7 @@ variables: DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA build:docker: + image: docker:19.03.12 tags: - dind stage: build @@ -23,10 +23,11 @@ build:docker: -t $DOCKER_IMAGE_SHA . .deploy: &deploy + image: docker:19.03.12 stage: deploy needs: ["build:docker"] tags: - - baremetal + - dind script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker tag $DOCKER_IMAGE_SHA $TAG diff --git a/build/ci/.terraform-ci.yml b/build/ci/.terraform-ci.yml index 64a9afccf..62dd24efa 100644 --- a/build/ci/.terraform-ci.yml +++ b/build/ci/.terraform-ci.yml @@ -1,4 +1,3 @@ -image: registry.gitlab.com/gitlab-org/terraform-images/stable:latest variables: TF_ROOT: ${CI_PROJECT_DIR}/test/terraform @@ -10,6 +9,7 @@ cache: - ${TF_ROOT}/.terraform .terraform_prefab: &tf + image: registry.gitlab.com/gitlab-org/terraform-images/stable:latest variables: CI_DEBUG_TRACE: "false" before_script: -- GitLab