From 9dfeec1bc815b75d2152bcce5f26f41c0a00dc82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gilles?= <sebastien.gilles@inria.fr>
Date: Fri, 14 May 2021 19:35:11 +0200
Subject: [PATCH] CI: the Dockerfile was not properly modified for both new
targets.
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bf3129..1b74302 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build_fedora:
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# Latest is always generated but not pushed if ${UPDATE_LATEST_TAG} is not "True"
- - docker build -f docker/Dockerfile_full -t $CI_REGISTRY/$CI_PROJECT_PATH/fedora_for_tp:${TAG} -t $CI_REGISTRY/$CI_PROJECT_PATH/fedora_for_tp:latest .
+ - docker build -f docker/Dockerfile.fedora -t $CI_REGISTRY/$CI_PROJECT_PATH/fedora_for_tp:${TAG} -t $CI_REGISTRY/$CI_PROJECT_PATH/fedora_for_tp:latest .
- docker container prune
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/fedora_for_tp:${TAG}
- if [ "${UPDATE_LATEST_TAG}" == "True" ]; then docker push $CI_REGISTRY/$CI_PROJECT_PATH/fedora_for_tp:latest; fi
@@ -51,7 +51,7 @@ build_boost:
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# Latest is always generated but not pushed if ${UPDATE_LATEST_TAG} is not "True"
- - docker build -f docker/Dockerfile_full -t $CI_REGISTRY/$CI_PROJECT_PATH/with_boost:${TAG} -t $CI_REGISTRY/$CI_PROJECT_PATH/with_boost:latest .
+ - docker build -f docker/Dockerfile.boost -t $CI_REGISTRY/$CI_PROJECT_PATH/with_boost:${TAG} -t $CI_REGISTRY/$CI_PROJECT_PATH/with_boost:latest .
- docker container prune
- docker push $CI_REGISTRY/$CI_PROJECT_PATH/with_boost:${TAG}
- if [ "${UPDATE_LATEST_TAG}" == "True" ]; then docker push $CI_REGISTRY/$CI_PROJECT_PATH/with_boost:latest; fi
\ No newline at end of file
--
GitLab