Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Commits
5a54967d
Commit
5a54967d
authored
1 month ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: populate OCI labels
parent
e6fd0a94
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1128
feat: populate OCI labels
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/debian/Dockerfile
+9
-4
9 additions, 4 deletions
containers/debian/Dockerfile
containers/eic/Dockerfile
+83
-0
83 additions, 0 deletions
containers/eic/Dockerfile
with
92 additions
and
4 deletions
containers/debian/Dockerfile
+
9
−
4
View file @
5a54967d
...
...
@@ -4,12 +4,17 @@ ARG BASE_IMAGE="amd64/debian:stable-slim"
ARG
BUILD_IMAGE="debian_stable_base"
# Minimal container based on Debian base systems for up-to-date packages.
FROM
${BASE_IMAGE}
FROM
${BASE_IMAGE}
ARG
TARGETPLATFORM
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="${BUILD_IMAGE}" \
march="amd64"
# Open Container Initiative labels
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
...
...
This diff is collapsed.
Click to expand it.
containers/eic/Dockerfile
+
83
−
0
View file @
5a54967d
...
...
@@ -37,6 +37,15 @@ ARG INTERNAL_TAG="master"
FROM
${DOCKER_REGISTRY}${BUILDER_IMAGE}:${INTERNAL_TAG}
as
builder_concretization_default
ARG
TARGETPLATFORM
# Open Container Initiative labels
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
--from=spack-environment . /opt/spack-environment/
ARG
ENV=xl
...
...
@@ -59,6 +68,15 @@ EOF
FROM
builder_concretization_default
as
builder_installation_default
ARG
TARGETPLATFORM
# Open Container Initiative labels
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)
RUN
--mount
=
type
=
cache,target
=
/ccache,id
=
${
TARGETPLATFORM
}
\
--mount
=
type
=
cache,target
=
/var/cache/spack
\
...
...
@@ -86,6 +104,15 @@ EOF
FROM
${DOCKER_REGISTRY}${RUNTIME_IMAGE}:${INTERNAL_TAG}
as
runtime_concretization_default
ARG
TARGETPLATFORM
# Open Container Initiative labels
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
--from=spack-environment . /opt/spack-environment/
ARG
ENV=xl
...
...
@@ -105,6 +132,15 @@ COPY --from=builder_installation_default \
FROM
runtime_concretization_default
as
runtime_installation_default
ARG
TARGETPLATFORM
# Open Container Initiative labels
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)
RUN
--mount
=
type
=
cache,target
=
/var/cache/spack
\
--mount
=
type
=
secret,id
=
mirrors,target
=
/opt/spack/etc/spack/mirrors.yaml
\
...
...
@@ -139,6 +175,15 @@ EOF
FROM
builder_installation_default
as
builder_concretization_custom
ARG
TARGETPLATFORM
# Open Container Initiative labels
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)
## Note: these default versions are just the very first commit.
ARG
EDM4EIC_VERSION="8aeb507f93a93257c99985efbce0ec1371e0b331"
...
...
@@ -185,6 +230,15 @@ EOF
FROM
builder_concretization_custom
as
builder_installation_custom
ARG
TARGETPLATFORM
# Open Container Initiative labels
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)
RUN
--mount
=
type
=
cache,target
=
/ccache,id
=
${
TARGETPLATFORM
}
\
--mount
=
type
=
cache,target
=
/var/cache/spack
\
...
...
@@ -218,6 +272,17 @@ EOF
## - runtime base with concretization of custom versions (taken from equivalent builder)
## ========================================================================================
FROM
runtime_installation_default
as
runtime_concretization_custom
ARG
TARGETPLATFORM
# Open Container Initiative labels
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 \
/opt/spack-environment/${ENV}/spack.* \
/opt/spack-environment/${ENV}/
...
...
@@ -233,6 +298,15 @@ COPY --from=builder_installation_custom \
FROM
runtime_concretization_custom
as
runtime_installation_custom
ARG
TARGETPLATFORM
# Open Container Initiative labels
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)
RUN
--mount
=
type
=
cache,target
=
/var/cache/spack
\
--mount
=
type
=
secret,id
=
mirrors,target
=
/opt/spack/etc/spack/mirrors.yaml
\
...
...
@@ -259,6 +333,15 @@ EOF
FROM
runtime_installation_custom
ARG
TARGETPLATFORM
# Open Container Initiative labels
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
RUN
<<
EOF
set -e
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment