From bb76cff33e9f3e68b669f39853b3182c59f9c514 Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alexey.kuklin@vereign.com>
Date: Mon, 14 Dec 2020 07:43:23 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50d6e8e..59b744e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-image: docker:latest
-services:
-- docker:dind
-
variables:
DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
@@ -22,7 +18,7 @@ ppc64le:
IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
stage: build
tags:
- - ppc64le
+ - ppc64le-docker
script:
- docker build --build-arg ARCH=$CI_JOB_NAME --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 CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
- docker push $IMAGE
@@ -31,7 +27,7 @@ amd64:
IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
stage: build
tags:
- - amd64
+ - amd64-docker
script:
- docker build --build-arg ARCH=$CI_JOB_NAME --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 CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
- docker push $IMAGE
@@ -43,7 +39,7 @@ manifest:
IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
stage: manifest
tags:
- - script
+ - amd64-docker
script:
- docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le
- docker manifest push $IMAGE
--
GitLab