From 162c24940f8aa7a6b3d1df37f379ebc38f41dae4 Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Wed, 17 Aug 2022 11:42:28 +0530
Subject: [PATCH] Use containers/jug/xl.Dockerfile as base for oneapi_jug_xl
We use sed to replace base image to oneapi_jug_dev and pipe to
docker build for oneapi_jug_xl image.
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b83dcbd20..fc0e1938a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,8 +272,8 @@ oneapi_jug_xl:default:
script:
- cp containers/jug/setup_detectors.py containers/oneapi
- cp detectors.yaml containers/oneapi
- - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG}
- -f containers/oneapi/onexl.Dockerfile
+ - sed 's/^FROM.*$/FROM ${DOCKER_REGISTRY}oneapi_jug_dev:${INTERNAL_TAG}/' containers/jug/xl.Dockerfile | \
+ docker build - -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
--build-arg NPDET_VERSION=${NPDET_VERSION}
@@ -294,8 +294,8 @@ oneapi_jug_xl:nightly:
script:
- cp containers/jug/setup_detectors.py containers/oneapi
- cp detectors.yaml containers/oneapi
- - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG}
- -f containers/oneapi/onexl.Dockerfile
+ - sed 's/^FROM.*$/FROM ${DOCKER_REGISTRY}oneapi_jug_dev:${INTERNAL_TAG}/' containers/jug/xl.Dockerfile | \
+ docker build - -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-arg NIGHTLY=1
--
GitLab