From efed206af029ddf48a2fe50e74652be038d14859 Mon Sep 17 00:00:00 2001 From: Alexey Kuklin <alex@kuklin.eu> Date: Thu, 14 May 2020 10:27:34 +0300 Subject: [PATCH] devops-change-builder --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81504b6..a166760 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ -image: docker:latest +image: registry.vereign.com/docker/docker:master services: -- docker:dind + - registry.vereign.com/docker/docker:dind-master stages: - build @@ -26,7 +26,7 @@ after_script: ppc64le: stage: build tags: - - ppc64le + - ppc64le-docker script: - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE_ppc64le -f Dockerfile . - docker push $IMAGE_ppc64le @@ -35,7 +35,7 @@ amd64: variables: stage: build tags: - - amd64 + - amd64-docker script: - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE_amd64 -f Dockerfile . - docker push $IMAGE_amd64 @@ -43,7 +43,7 @@ amd64: manifest: stage: manifest tags: - - amd64 + - amd64-docker script: - docker manifest create $MANIFEST $IMAGE_amd64 $IMAGE_ppc64le - docker manifest annotate $MANIFEST $IMAGE_amd64 --os linux --arch amd64 -- GitLab