From 961c59f5ce15b18b1590a4fea56848cd28633f01 Mon Sep 17 00:00:00 2001
From: Alex <apuret@takima.fr>
Date: Tue, 7 Dec 2021 10:33:20 +0100
Subject: [PATCH] 1.20
---
.gitlab-ci.yml | 8 +++++---
build.sh | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f03414a..fc03a0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,11 +5,13 @@ build:
stage: build
services:
- docker:18.09.6-dind
- before_script:
- - export TAG=${CI_COMMIT_TAG:-latest}
script:
+ - echo $CI_COMMIT_TAG
+ - export TAG=${CI_COMMIT_TAG:-latest}
+ - echo $TAG
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.e-biz.fr
- ./build.sh $TAG $CI_REGISTRY_IMAGE
- docker push $CI_REGISTRY_IMAGE:$TAG
rules:
- - if: '$CI_COMMIT_BRANCH == "main"'
\ No newline at end of file
+ - if: '$CI_COMMIT_BRANCH == "main"'
+ - if: '$CI_COMMIT_TAG != null'
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 139cf5c..f60db14 100755
--- a/build.sh
+++ b/build.sh
@@ -5,4 +5,6 @@ set -e
TAG=${1:-latest}
REGISTRY=${2:-theia}
+echo $TAG
+
docker build --build-arg "version=$TAG" . -t "$REGISTRY:$TAG" --no-cache
\ No newline at end of file
--
GitLab