From 104b007673a870f8fca8ebdd138bfdf600d6a7f3 Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alex@kuklin.eu>
Date: Mon, 17 Feb 2020 02:26:40 +0200
Subject: [PATCH] ci: image removal
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f567af9..e7f1aa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ stages:
- deploy
variables:
+ DOCKER_TLS_CERTDIR: "/certs"
DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
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
@@ -20,6 +21,7 @@ before_script:
after_script:
+ - "docker rmi $MANIFEST $IMAGE_amd64 $IMAGE_ppc64le || true"
- "rm -vRf $DOCKER_CONFIG"
ppc64le:
@@ -49,14 +51,12 @@ manifest:
- docker manifest annotate $MANIFEST $IMAGE_ppc64le --os linux --arch ppc64le
- docker manifest push $MANIFEST
-
deploy:
stage: deploy
tags:
- - hv2
+ - ppc64le
only:
- master
script:
- - apk add curl
- - for ref in $DEPLOYENVS; do curl -X POST -F token=$TRIGGER_TOKEN -F ref=$ref -F variables[branch]=$CI_COMMIT_REF_NAME $TRIGGER_CODE_BUILD; done
+ - for ref in $DEPLOYENVS; do curl -X POST -F token=$TRIGGER_TOKEN -F ref=$ref -F variables[branch]=$CI_COMMIT_REF_NAME $TRIGGER_CODE_BUILD; done
--
GitLab