From 2f5edc7f8344ee375710722719c1e6fac088a36c Mon Sep 17 00:00:00 2001
From: Bryan BRANCOTTE <bryan.brancotte@pasteur.fr>
Date: Wed, 12 Apr 2023 14:51:26 +0200
Subject: [PATCH] Revert "build both dockerfile"
This reverts commit 8decd4f350d4adccbaca8f6461ba4b10b98cdb40
---
.gitlab-ci.yml | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86adca3..d644ec6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,24 +10,20 @@ build:
script:
- docker --version
# pull the latest build on master
- - docker pull "$CI_REGISTRY_IMAGE/master/$DOCKERFILE_NAME:latest" || true
+ - docker pull "$CI_REGISTRY_IMAGE/master:latest" || true
# pull the latest build on this branch
- - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:latest" || true
+ - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest" || true
# build the image while passing commit SHA and tagging the image with it
- docker build
--build-arg CI_COMMIT_REF_SLUG
--build-arg CI_COMMIT_SHA
- --cache-from "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:latest"
- --cache-from "$CI_REGISTRY_IMAGE/master/$DOCKERFILE_NAME:latest"
- --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:$CI_COMMIT_SHA"
- --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:latest"
- -f $DOCKERFILE_NAME
+ --cache-from "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest"
+ --cache-from "$CI_REGISTRY_IMAGE/master:latest"
+ --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"
+ --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest"
+ -f Dockerfile2
./
# push image as latest for the current branch
- docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest"
# push image tagged with its sha
- docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"
- parallel:
- matrix:
- - DOCKERFILE_NAME: [Dockerfile, Dockerfile2]
-
--
GitLab