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
a2ddbe17
Commit
a2ddbe17
authored
6 months ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: refer to id/secret variables in mirrors.yaml.in
parent
ef4b58bd
No related branches found
No related tags found
1 merge request
!1045
feat: refer to id/secret variables in mirrors.yaml.in
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+5
-1
5 additions, 1 deletion
.gitlab-ci.yml
containers/jug/dev.Dockerfile
+13
-1
13 additions, 1 deletion
containers/jug/dev.Dockerfile
mirrors.yaml.in
+8
-8
8 additions, 8 deletions
mirrors.yaml.in
with
26 additions
and
10 deletions
.gitlab-ci.yml
+
5
−
1
View file @
a2ddbe17
...
...
@@ -2,7 +2,7 @@ image: alpine
variables
:
## External images
DOCKER_IMAGE
:
docker.io/docker:27.
2.0
DOCKER_IMAGE
:
docker.io/docker:27.
3.1
SINGULARITY_IMAGE
:
quay.io/singularity/singularity:v3.11.5
## Default versions are specified in packages.yaml but can be overridden
...
...
@@ -448,6 +448,10 @@ eic:
--build-arg jobs=${JOBS}
--build-context spack-environment=spack-environment
--secret id=mirrors,src=mirrors.yaml
--secret type=env,id=CI_REGISTRY_USER,env=CI_REGISTRY_USER
--secret type=env,id=CI_REGISTRY_PASSWORD,env=CI_REGISTRY_PASSWORD
--secret type=env,id=GITHUB_REGISTRY_USER,env=GITHUB_REGISTRY_USER
--secret type=env,id=GITHUB_REGISTRY_TOKEN,env=GITHUB_REGISTRY_TOKEN
--provenance
false
containers/jug
2>&1 | tee build.log
...
...
This diff is collapsed.
Click to expand it.
containers/jug/dev.Dockerfile
+
13
−
1
View file @
a2ddbe17
#syntax=docker/dockerfile:1.
8
#syntax=docker/dockerfile:1.
10
#check
ARG
DOCKER_REGISTRY="eicweb/"
ARG
BUILDER_IMAGE="debian_stable_base"
...
...
@@ -63,6 +63,10 @@ ARG TARGETPLATFORM
RUN
--mount
=
type
=
cache,target
=
/ccache,id
=
${
TARGETPLATFORM
}
\
--mount
=
type
=
cache,target
=
/var/cache/spack
\
--mount
=
type
=
secret,id
=
mirrors,target
=
/opt/spack/etc/spack/mirrors.yaml
\
--mount
=
type
=
secret,id
=
CI_REGISTRY_USER,env
=
CI_REGISTRY_USER
\
--mount
=
type
=
secret,id
=
CI_REGISTRY_PASSWORD,env
=
CI_REGISTRY_PASSWORD
\
--mount
=
type
=
secret,id
=
GITHUB_REGISTRY_USER,env
=
GITHUB_REGISTRY_USER
\
--mount
=
type
=
secret,id
=
GITHUB_REGISTRY_TOKEN,env
=
GITHUB_REGISTRY_TOKEN
\
<<
EOF
set -e
export CCACHE_DIR=/ccache
...
...
@@ -104,6 +108,10 @@ ARG TARGETPLATFORM
# 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
\
--mount
=
type
=
secret,id
=
CI_REGISTRY_USER,env
=
CI_REGISTRY_USER
\
--mount
=
type
=
secret,id
=
CI_REGISTRY_PASSWORD,env
=
CI_REGISTRY_PASSWORD
\
--mount
=
type
=
secret,id
=
GITHUB_REGISTRY_USER,env
=
GITHUB_REGISTRY_USER
\
--mount
=
type
=
secret,id
=
GITHUB_REGISTRY_TOKEN,env
=
GITHUB_REGISTRY_TOKEN
\
<<
EOF
make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
SPACK_ENV=${SPACK_ENV} SPACK_INSTALL_FLAGS="--use-buildcache only"
...
...
@@ -181,6 +189,10 @@ ARG TARGETPLATFORM
RUN
--mount
=
type
=
cache,target
=
/ccache,id
=
${
TARGETPLATFORM
}
\
--mount
=
type
=
cache,target
=
/var/cache/spack
\
--mount
=
type
=
secret,id
=
mirrors,target
=
/opt/spack/etc/spack/mirrors.yaml
\
--mount
=
type
=
secret,id
=
CI_REGISTRY_USER,env
=
CI_REGISTRY_USER
\
--mount
=
type
=
secret,id
=
CI_REGISTRY_PASSWORD,env
=
CI_REGISTRY_PASSWORD
\
--mount
=
type
=
secret,id
=
GITHUB_REGISTRY_USER,env
=
GITHUB_REGISTRY_USER
\
--mount
=
type
=
secret,id
=
GITHUB_REGISTRY_TOKEN,env
=
GITHUB_REGISTRY_TOKEN
\
<<
EOF
set -e
export CCACHE_DIR=/ccache
...
...
This diff is collapsed.
Click to expand it.
mirrors.yaml.in
+
8
−
8
View file @
a2ddbe17
...
...
@@ -5,21 +5,21 @@ mirrors:
signed: false
fetch:
access_pair:
- ${
CI_REGISTRY_USER
}
- ${
CI_REGISTRY_PASSWORD
}
id_variable:
CI_REGISTRY_USER
secret_variable:
CI_REGISTRY_PASSWORD
push:
access_pair:
- ${
CI_REGISTRY_USER
}
- ${
CI_REGISTRY_PASSWORD
}
id_variable:
CI_REGISTRY_USER
secret_variable:
CI_REGISTRY_PASSWORD
ghcr:
autopush: true
url: oci://ghcr.io/eic/spack-${SPACK_VERSION}
signed: false
fetch:
access_pair:
- ${
GITHUB_REGISTRY_USER
}
- ${
GITHUB_REGISTRY_TOKEN
}
id_variable:
GITHUB_REGISTRY_USER
secret_variable:
GITHUB_REGISTRY_TOKEN
push:
access_pair:
- ${
GITHUB_REGISTRY_USER
}
- ${
GITHUB_REGISTRY_TOKEN
}
id_variable:
GITHUB_REGISTRY_USER
secret_variable:
GITHUB_REGISTRY_TOKEN
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