From 19ac170cc1cb9bfcf516e5c6c7c1ed4420598fce Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alex@kuklin.eu>
Date: Mon, 18 May 2020 14:37:07 +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 e7f1aa2..a068c9c 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
@@ -27,7 +27,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
@@ -36,7 +36,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
@@ -44,7 +44,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