From 831c5c10702eeee7379e97b67d51cec43b822d49 Mon Sep 17 00:00:00 2001
From: Ivan Vasilev <ivan.vasilev@vereign.com>
Date: Fri, 14 Aug 2020 10:20:45 +0300
Subject: [PATCH] updated gitlab ci to use default images removed not used
docker build argument
---
.gitlab-ci.yml | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78e537a..c6336e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,10 @@
-image: registry.vereign.com/docker/docker:master
-services:
- - registry.vereign.com/docker/docker:dind-master
-
variables:
DOCKER_CLI_EXPERIMENTAL: 'enabled'
JOB_IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
MANIFEST_IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
- CI_DEBUG_TRACE: "true"
+ IMAGE_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
+ IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
+ CI_DEBUG_TRACE: "false"
stages:
- build
@@ -18,7 +16,7 @@ before_script:
.build:
script:
- - docker build --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $JOB_IMAGE -f Dockerfile .
+ - docker build --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $JOB_IMAGE -f Dockerfile .
- docker push $JOB_IMAGE
ppc64le:
@@ -37,9 +35,6 @@ amd64:
manifest:
stage: manifest
- variables:
- IMAGE_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
- IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
tags:
- ppc64le-docker
script:
--
GitLab