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

fix: inherit LABELS, only set `title`

parent 6f62b15a
No related branches found
No related tags found
1 merge request!1188fix: inherit LABELS, only set `title`
Pipeline #121250 failed
Stage: config
Stage: base
Stage: eic
Stage: deploy
Stage: benchmarks
Stage: finalize
Pipeline: reconstruction_benchmarks

#121254

    Pipeline: eic_container: fix: inherit LABELS, only set `title`

    #121253

      Pipeline: eic_container: fix: inherit LABELS, only set `title`

      #121252

        Show whitespace changes
        Inline Side-by-side
        containers/debian/Dockerfile
        + 8
        − 7
        View file @ adcf603c
        ...@@ -7,14 +7,15 @@ ARG BUILD_IMAGE="debian_stable_base" ...@@ -7,14 +7,15 @@ ARG BUILD_IMAGE="debian_stable_base"
        FROM ${BASE_IMAGE} FROM ${BASE_IMAGE}
        ARG TARGETPLATFORM ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels (no heredoc support)
        LABEL \
        org.opencontainers.image.vendor="Electron-Ion Collider" \
        org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>" \
        org.opencontainers.image.url="https://github.com/eic/containers" \
        org.opencontainers.image.source="https://github.com/eic/containers" \
        org.opencontainers.image.documentation="https://eic.github.io" \
        org.opencontainers.image.license="GPL-3.0-or-later"
        LABEL org.opencontainers.image.title="Electron-Ion Collider base image ($TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider base image ($TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        COPY bashrc /root/.bashrc COPY bashrc /root/.bashrc
        ......
        containers/eic/Dockerfile
        + 0
        − 54
        View file @ adcf603c
        ...@@ -39,12 +39,6 @@ ARG TARGETPLATFORM ...@@ -39,12 +39,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider build concretization image (default configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider build concretization image (default configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        ## Copy our default environment ## Copy our default environment
        COPY --from=spack-environment . /opt/spack-environment/ COPY --from=spack-environment . /opt/spack-environment/
        ...@@ -70,12 +64,6 @@ ARG TARGETPLATFORM ...@@ -70,12 +64,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider build installation image (default configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider build installation image (default configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        # Installation (default environment) # Installation (default environment)
        RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
        ...@@ -106,12 +94,6 @@ ARG TARGETPLATFORM ...@@ -106,12 +94,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider runtime concretization image (default configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider runtime concretization image (default configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        ## Copy our default environment ## Copy our default environment
        COPY --from=spack-environment . /opt/spack-environment/ COPY --from=spack-environment . /opt/spack-environment/
        ...@@ -134,12 +116,6 @@ ARG TARGETPLATFORM ...@@ -134,12 +116,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider runtime installation image (default configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider runtime installation image (default configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        # Installation (default environment, from buildcache) # Installation (default environment, from buildcache)
        RUN --mount=type=cache,target=/var/cache/spack \ RUN --mount=type=cache,target=/var/cache/spack \
        ...@@ -164,12 +140,6 @@ ARG TARGETPLATFORM ...@@ -164,12 +140,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider build concretization image (custom configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider build concretization image (custom configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        ## 2. Setup our environment with custom versions (on top of cached layer) ## 2. Setup our environment with custom versions (on top of cached layer)
        ## Note: these default versions are just the very first commit. ## Note: these default versions are just the very first commit.
        ...@@ -219,12 +189,6 @@ ARG TARGETPLATFORM ...@@ -219,12 +189,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider build installation image (custom configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider build installation image (custom configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        # Installation (custom environment) # Installation (custom environment)
        RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
        ...@@ -263,12 +227,6 @@ ARG TARGETPLATFORM ...@@ -263,12 +227,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider runtime concretization image (custom configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider runtime concretization image (custom configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        COPY --from=builder_installation_custom \ COPY --from=builder_installation_custom \
        /opt/spack-environment/${ENV}/spack.* \ /opt/spack-environment/${ENV}/spack.* \
        ...@@ -287,12 +245,6 @@ ARG TARGETPLATFORM ...@@ -287,12 +245,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider runtime installation image (custom configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider runtime installation image (custom configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        # Installation (default environment, from buildcache) # Installation (default environment, from buildcache)
        RUN --mount=type=cache,target=/var/cache/spack \ RUN --mount=type=cache,target=/var/cache/spack \
        ...@@ -322,12 +274,6 @@ ARG TARGETPLATFORM ...@@ -322,12 +274,6 @@ ARG TARGETPLATFORM
        # Open Container Initiative labels # Open Container Initiative labels
        LABEL org.opencontainers.image.title="Electron-Ion Collider runtime installation image (custom configuration, $TARGETPLATFORM)" LABEL org.opencontainers.image.title="Electron-Ion Collider runtime installation image (custom configuration, $TARGETPLATFORM)"
        LABEL org.opencontainers.image.vendor="Electron-Ion Collider"
        LABEL org.opencontainers.image.authors="Electron-Ion Collider Software Working Groups <eic-software-l-owner@lists.bnl.gov>"
        LABEL org.opencontainers.image.url="https://github.com/eic/containers"
        LABEL org.opencontainers.image.source="https://github.com/eic/containers"
        LABEL org.opencontainers.image.documentation="https://eic.github.io"
        LABEL org.opencontainers.image.license="GPL-3.0-or-later"
        ## Create views at /opt/local and /opt/detector ## Create views at /opt/local and /opt/detector
        RUN <<EOF RUN <<EOF
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment