From c38418fc992df4cc0cdda08b6dcb047138bc716d Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 6 Apr 2021 20:25:33 +0200
Subject: [PATCH] [ci] #388: Tag with the commit hash and branch
try with one login at the beginning, try pull
---
.gitlab-ci.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef920300..67c5601a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,19 +83,19 @@ tests-3.9:
services:
- docker:dind
script:
- - docker pull $CI_REGISTRY_IMAGE/$KIND:$IMAGE_TAG || true
- - docker build --cache-from $CI_REGISTRY_IMAGE/$KIND:$IMAGE_TAG --pull -t "$CI_REGISTRY_IMAGE/$KIND:$IMAGE_TAG" -f release/container-$KIND .
- docker login -u "$CI_REGISTRY_USER" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- - docker tag "$CI_REGISTRY_IMAGE/$KIND:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$KIND:$IMAGE_TAG"
- - docker push "$CI_REGISTRY_IMAGE/$KIND:$IMAGE_TAG"
- - docker tag "$CI_REGISTRY_IMAGE/$KIND:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$KIND:latest"
+ - docker pull $CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA || true
+ - docker build --cache-from $CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA --pull -t "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA" -f release/container-$KIND .
+ - docker push "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA"
+ - docker tag "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_BRANCH"
+ - docker push "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_BRANCH"
+ - docker tag "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_BRANCH" "$CI_REGISTRY_IMAGE/$KIND:latest"
- docker push "$CI_REGISTRY_IMAGE/$KIND:latest"
container:poetry:
extends: .container
variables:
KIND: "poetry"
- IMAGE_TAG: "dev"
# rules:
# - when: manual
@@ -103,7 +103,8 @@ container:pip:
extends: .container
variables:
KIND: "pip"
- IMAGE_TAG: "dev"
+# rules:
+# - when: manual
pypi_test:
stage: package
--
GitLab