diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cea70a822ed1df70127f99ebaf3ba82d475cf7ed..acf0f68820b86e6e41ec754d3798072749119891 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -297,7 +297,6 @@ jug_xl:default: script: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker buildx create --name builder --driver docker-container --bootstrap --use - - cp detectors.yaml containers/jug - docker buildx build --push -t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG} ${EXPORT_TAG:+ @@ -312,6 +311,7 @@ jug_xl:default: --build-arg JUGGLER_VERSION=${JUGGLER_VERSION} --build-arg EICRECON_VERSION=${EICRECON_VERSION} --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) + --build-context detectors=. containers/jug jug_xl:nightly: @@ -337,7 +337,6 @@ jug_xl:nightly: script: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker buildx create --name builder --driver docker-container --bootstrap --use - - cp detectors.yaml containers/jug - | PUSH_NIGHTLY_WITH_DATE="" if [ "$CI_COMMIT_BRANCH" == "master" ]; then @@ -360,6 +359,7 @@ jug_xl:nightly: --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 + --build-context detectors=. containers/jug jug_xl:feature: diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile index 1ecf87156803c92f0e408e79fe4ec0b683924c09..73e1c0bece704e9549c0b49575d2f4c49f64032d 100644 --- a/containers/jug/xl.Dockerfile +++ b/containers/jug/xl.Dockerfile @@ -1,4 +1,4 @@ -#syntax=docker/dockerfile:1.2 +#syntax=docker/dockerfile:1.4 ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/" ARG BASE_IMAGE="jug_dev" ARG INTERNAL_TAG="testing" @@ -129,7 +129,7 @@ ADD ${EICWEB}/452/repository/tree?ref=master /tmp/452.json ADD https://api.github.com/repos/eic/ip6 /tmp/ip6.json ADD https://api.github.com/repos/eic/epic /tmp/epic.json COPY setup_detectors.py /tmp -COPY detectors.yaml /tmp +COPY --from=detectors detectors.yaml /tmp RUN --mount=type=cache,target=/ccache/ \ cd /tmp \ && export CCACHE_DIR=/ccache/$TARGETPLATFORM \