From b87aa800aebad190cbc473771c4c4301cd96fd43 Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alexey.kuklin@vereign.com>
Date: Mon, 14 Dec 2020 08:28:43 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5aab4e..e5ecc1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-image: docker:latest
-services:
-- docker:dind
-
stages:
- build
- manifest
@@ -23,7 +19,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 GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
- docker push $IMAGE
@@ -33,7 +29,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 GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
- docker push $IMAGE
@@ -45,20 +41,10 @@ manifest:
IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
stage: manifest
tags:
- - amd64
+ - amd64-docker
script:
- docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le
- docker manifest push $IMAGE
-
-deploy:
- stage: deploy
- tags:
- - hv2
- only:
- - master
- script:
- - apk add curl
- - for ref in $DEPLOYENVS; do curl -X POST -F token=$TRIGGER_TOKEN -F ref=$ref -F variables[branch]=master https://code.vereign.com/api/v4/projects/59/trigger/pipeline; done
-
+
--
GitLab