Skip to content
Snippets Groups Projects
Commit 78e37377 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

feat: avoid cp detectors.yaml; COPY --from=detectors context

parent 6316fd83
No related branches found
No related tags found
1 merge request!511feat: avoid cp detectors.yaml; COPY --from=detectors context
...@@ -297,7 +297,6 @@ jug_xl:default: ...@@ -297,7 +297,6 @@ jug_xl:default:
script: script:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- docker buildx create --name builder --driver docker-container --bootstrap --use - docker buildx create --name builder --driver docker-container --bootstrap --use
- cp detectors.yaml containers/jug
- docker buildx build --push - docker buildx build --push
-t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG} -t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
${EXPORT_TAG:+ ${EXPORT_TAG:+
...@@ -312,6 +311,7 @@ jug_xl:default: ...@@ -312,6 +311,7 @@ jug_xl:default:
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION} --build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
--build-arg EICRECON_VERSION=${EICRECON_VERSION} --build-arg EICRECON_VERSION=${EICRECON_VERSION}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-context detectors=.
containers/jug containers/jug
jug_xl:nightly: jug_xl:nightly:
...@@ -337,7 +337,6 @@ jug_xl:nightly: ...@@ -337,7 +337,6 @@ jug_xl:nightly:
script: script:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- docker buildx create --name builder --driver docker-container --bootstrap --use - docker buildx create --name builder --driver docker-container --bootstrap --use
- cp detectors.yaml containers/jug
- | - |
PUSH_NIGHTLY_WITH_DATE="" PUSH_NIGHTLY_WITH_DATE=""
if [ "$CI_COMMIT_BRANCH" == "master" ]; then if [ "$CI_COMMIT_BRANCH" == "master" ]; then
...@@ -360,6 +359,7 @@ jug_xl:nightly: ...@@ -360,6 +359,7 @@ jug_xl:nightly:
--build-arg INTERNAL_TAG=${INTERNAL_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 JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-arg NIGHTLY=1 --build-arg NIGHTLY=1
--build-context detectors=.
containers/jug containers/jug
jug_xl:feature: jug_xl:feature:
......
#syntax=docker/dockerfile:1.2 #syntax=docker/dockerfile:1.4
ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/" ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG BASE_IMAGE="jug_dev" ARG BASE_IMAGE="jug_dev"
ARG INTERNAL_TAG="testing" ARG INTERNAL_TAG="testing"
...@@ -129,7 +129,7 @@ ADD ${EICWEB}/452/repository/tree?ref=master /tmp/452.json ...@@ -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/ip6 /tmp/ip6.json
ADD https://api.github.com/repos/eic/epic /tmp/epic.json ADD https://api.github.com/repos/eic/epic /tmp/epic.json
COPY setup_detectors.py /tmp COPY setup_detectors.py /tmp
COPY detectors.yaml /tmp COPY --from=detectors detectors.yaml /tmp
RUN --mount=type=cache,target=/ccache/ \ RUN --mount=type=cache,target=/ccache/ \
cd /tmp \ cd /tmp \
&& export CCACHE_DIR=/ccache/$TARGETPLATFORM \ && export CCACHE_DIR=/ccache/$TARGETPLATFORM \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment