From eaa5da5e890cc029bcc6f697ab0f2a6c3a9119f9 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 6 Apr 2021 20:35:12 +0200
Subject: [PATCH] [ci] #388: Rename to image
---
.gitlab-ci.yml | 12 ++++++------
release/{container-pip => pip-image} | 0
release/{container-poetry => poetry-image} | 0
3 files changed, 6 insertions(+), 6 deletions(-)
rename release/{container-pip => pip-image} (100%)
rename release/{container-poetry => poetry-image} (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67c5601a..aa1622a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ tests-3.9:
variables:
PYTHON_VERSION: "3.9"
-.container:
+.image:
stage: package
tags: [docker]
image: docker:latest
@@ -85,22 +85,22 @@ tests-3.9:
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- 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 build --cache-from $CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA --pull -t "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA" -f release/$KIND-image .
- 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
+image:poetry:
+ extends: .image
variables:
KIND: "poetry"
# rules:
# - when: manual
-container:pip:
- extends: .container
+image:pip:
+ extends: .image
variables:
KIND: "pip"
# rules:
diff --git a/release/container-pip b/release/pip-image
similarity index 100%
rename from release/container-pip
rename to release/pip-image
diff --git a/release/container-poetry b/release/poetry-image
similarity index 100%
rename from release/container-poetry
rename to release/poetry-image
--
GitLab