diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8778b543ab748b661ea5f9b25e5eb9735b5d74e5..73a8f742178aa6661f47cdec6e259644ef5b8b62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -249,7 +249,7 @@ oneapi_jug_dev:default: fi ## Copy jug_dev files into build context - cp -r containers/jug/* containers/oneapi - - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} + - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} ${CACHE_FLAG} -f containers/oneapi/onedev.Dockerfile --build-arg SPACK_VERSION="${SPACK_VERSION}" --build-arg SPACK_CHERRYPICKS="${SPACK_CHERRYPICKS}" @@ -273,7 +273,7 @@ oneapi_jug_xl:default: - cp containers/jug/setup_detectors.py containers/oneapi - cp detectors.yaml containers/oneapi - 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} + 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} @@ -301,7 +301,7 @@ oneapi_jug_xl:nightly: - cp containers/jug/setup_detectors.py containers/oneapi - cp detectors.yaml containers/oneapi - 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} + 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