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

feat: refer to id/secret variables in mirrors.yaml.in

parent ef4b58bd
No related branches found
No related tags found
1 merge request!1045feat: refer to id/secret variables in mirrors.yaml.in
...@@ -2,7 +2,7 @@ image: alpine ...@@ -2,7 +2,7 @@ image: alpine
variables: variables:
## External images ## 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 SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.5
## Default versions are specified in packages.yaml but can be overridden ## Default versions are specified in packages.yaml but can be overridden
...@@ -448,6 +448,10 @@ eic: ...@@ -448,6 +448,10 @@ eic:
--build-arg jobs=${JOBS} --build-arg jobs=${JOBS}
--build-context spack-environment=spack-environment --build-context spack-environment=spack-environment
--secret id=mirrors,src=mirrors.yaml --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 --provenance false
containers/jug containers/jug
2>&1 | tee build.log 2>&1 | tee build.log
......
#syntax=docker/dockerfile:1.8 #syntax=docker/dockerfile:1.10
#check #check
ARG DOCKER_REGISTRY="eicweb/" ARG DOCKER_REGISTRY="eicweb/"
ARG BUILDER_IMAGE="debian_stable_base" ARG BUILDER_IMAGE="debian_stable_base"
...@@ -63,6 +63,10 @@ ARG TARGETPLATFORM ...@@ -63,6 +63,10 @@ ARG TARGETPLATFORM
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
--mount=type=cache,target=/var/cache/spack \ --mount=type=cache,target=/var/cache/spack \
--mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \ --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 <<EOF
set -e set -e
export CCACHE_DIR=/ccache export CCACHE_DIR=/ccache
...@@ -104,6 +108,10 @@ ARG TARGETPLATFORM ...@@ -104,6 +108,10 @@ ARG TARGETPLATFORM
# 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 \
--mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \ --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 <<EOF
make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
SPACK_ENV=${SPACK_ENV} SPACK_INSTALL_FLAGS="--use-buildcache only" SPACK_ENV=${SPACK_ENV} SPACK_INSTALL_FLAGS="--use-buildcache only"
...@@ -181,6 +189,10 @@ ARG TARGETPLATFORM ...@@ -181,6 +189,10 @@ ARG TARGETPLATFORM
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
--mount=type=cache,target=/var/cache/spack \ --mount=type=cache,target=/var/cache/spack \
--mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \ --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 <<EOF
set -e set -e
export CCACHE_DIR=/ccache export CCACHE_DIR=/ccache
......
...@@ -5,21 +5,21 @@ mirrors: ...@@ -5,21 +5,21 @@ mirrors:
signed: false signed: false
fetch: fetch:
access_pair: access_pair:
- ${CI_REGISTRY_USER} id_variable: CI_REGISTRY_USER
- ${CI_REGISTRY_PASSWORD} secret_variable: CI_REGISTRY_PASSWORD
push: push:
access_pair: access_pair:
- ${CI_REGISTRY_USER} id_variable: CI_REGISTRY_USER
- ${CI_REGISTRY_PASSWORD} secret_variable: CI_REGISTRY_PASSWORD
ghcr: ghcr:
autopush: true autopush: true
url: oci://ghcr.io/eic/spack-${SPACK_VERSION} url: oci://ghcr.io/eic/spack-${SPACK_VERSION}
signed: false signed: false
fetch: fetch:
access_pair: access_pair:
- ${GITHUB_REGISTRY_USER} id_variable: GITHUB_REGISTRY_USER
- ${GITHUB_REGISTRY_TOKEN} secret_variable: GITHUB_REGISTRY_TOKEN
push: push:
access_pair: access_pair:
- ${GITHUB_REGISTRY_USER} id_variable: GITHUB_REGISTRY_USER
- ${GITHUB_REGISTRY_TOKEN} secret_variable: GITHUB_REGISTRY_TOKEN
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment