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
b41e0dad
Commit
b41e0dad
authored
1 year ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: set mirrors unsigned
parent
8dec5f46
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!811
feat: set mirrors unsigned
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
containers/jug/dev.Dockerfile
+4
-2
4 additions, 2 deletions
containers/jug/dev.Dockerfile
mirrors.yaml.in
+3
-0
3 additions, 0 deletions
mirrors.yaml.in
spack.sh
+2
-0
2 additions, 0 deletions
spack.sh
with
9 additions
and
2 deletions
containers/jug/dev.Dockerfile
+
4
−
2
View file @
b41e0dad
...
@@ -71,7 +71,7 @@ spack compiler find --scope site
...
@@ -71,7 +71,7 @@ spack compiler find --scope site
spack config blame compilers
spack config blame compilers
EOF
EOF
## Setup
eics3
buildcache mirrors
## Setup buildcache mirrors
## - this always adds the read-only mirror to the container
## - this always adds the read-only mirror to the container
## - the write-enabled mirror is provided later as a secret mount
## - the write-enabled mirror is provided later as a secret mount
ARG
S3_ACCESS_KEY=""
ARG
S3_ACCESS_KEY=""
...
@@ -79,12 +79,14 @@ ARG S3_SECRET_KEY=""
...
@@ -79,12 +79,14 @@ ARG S3_SECRET_KEY=""
RUN
--mount
=
type
=
cache,target
=
/var/cache/spack
<<
EOF
RUN
--mount
=
type
=
cache,target
=
/var/cache/spack
<<
EOF
set -e
set -e
if [ -n "${S3_ACCESS_KEY}" ] ; then
if [ -n "${S3_ACCESS_KEY}" ] ; then
spack mirror add --scope site
\
spack mirror add --scope site
--unsigned
\
--s3-endpoint-url https://eics3.sdcc.bnl.gov:9000 \
--s3-endpoint-url https://eics3.sdcc.bnl.gov:9000 \
--s3-access-key-id "${S3_ACCESS_KEY}" \
--s3-access-key-id "${S3_ACCESS_KEY}" \
--s3-access-key-secret "${S3_SECRET_KEY}" \
--s3-access-key-secret "${S3_SECRET_KEY}" \
eics3 s3://eictest/EPIC/spack/${SPACK_VERSION}
eics3 s3://eictest/EPIC/spack/${SPACK_VERSION}
fi
fi
spack mirror add --scope site --signed spack-${SPACK_VERSION} https://binaries.spack.io/${SPACK_VERSION}
spack mirror add --scope site --unsigned ghcr-${SPACK_VERSION} oci://ghcr.io/eic/spack-${SPACK_VERSION}
spack mirror list
spack mirror list
EOF
EOF
...
...
This diff is collapsed.
Click to expand it.
mirrors.yaml.in
+
3
−
0
View file @
b41e0dad
mirrors:
mirrors:
eicweb:
eicweb:
url: oci://${CI_REGISTRY}/${CI_PROJECT_PATH}/spack-${SPACK_VERSION}
url: oci://${CI_REGISTRY}/${CI_PROJECT_PATH}/spack-${SPACK_VERSION}
signed: false
push:
push:
access_pair:
access_pair:
- ${CI_REGISTRY_USER}
- ${CI_REGISTRY_USER}
- ${CI_REGISTRY_PASSWORD}
- ${CI_REGISTRY_PASSWORD}
ghcr:
ghcr:
url: oci://ghcr.io/eic/spack-${SPACK_VERSION}
url: oci://ghcr.io/eic/spack-${SPACK_VERSION}
signed: false
push:
push:
access_pair:
access_pair:
- ${GITHUB_REGISTRY_USER}
- ${GITHUB_REGISTRY_USER}
- ${GITHUB_REGISTRY_TOKEN}
- ${GITHUB_REGISTRY_TOKEN}
eics3rw:
eics3rw:
signed: false
fetch:
fetch:
url: s3://eictest/EPIC/spack/${SPACK_VERSION}
url: s3://eictest/EPIC/spack/${SPACK_VERSION}
access_pair:
access_pair:
...
...
This diff is collapsed.
Click to expand it.
spack.sh
+
2
−
0
View file @
b41e0dad
...
@@ -25,6 +25,7 @@ c07ddf83c32b7129247fe90eed486dd844047087
...
@@ -25,6 +25,7 @@ c07ddf83c32b7129247fe90eed486dd844047087
64cf67822471ec2d3df2625a6d713f80cbe7ff43
64cf67822471ec2d3df2625a6d713f80cbe7ff43
7a0c4e8017033430e5f15ed628be6b539e935ba9
7a0c4e8017033430e5f15ed628be6b539e935ba9
48fcfda1e7c1781cab4cada6d099823b263ab0cc
48fcfda1e7c1781cab4cada6d099823b263ab0cc
8c29e90fa9962f4a44f39f47217b46c85176af28
---
---
## Ref: https://github.com/spack/spack/commit/[hash]
## Ref: https://github.com/spack/spack/commit/[hash]
## [hash]: [description]
## [hash]: [description]
...
@@ -45,3 +46,4 @@ c07ddf83c32b7129247fe90eed486dd844047087
...
@@ -45,3 +46,4 @@ c07ddf83c32b7129247fe90eed486dd844047087
## 64cf67822471ec2d3df2625a6d713f80cbe7ff43: py-torch: move patch before def patch
## 64cf67822471ec2d3df2625a6d713f80cbe7ff43: py-torch: move patch before def patch
## 7a0c4e8017033430e5f15ed628be6b539e935ba9: acts: new versions 31.*
## 7a0c4e8017033430e5f15ed628be6b539e935ba9: acts: new versions 31.*
## 48fcfda1e7c1781cab4cada6d099823b263ab0cc: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
## 48fcfda1e7c1781cab4cada6d099823b263ab0cc: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
## 8c29e90fa9962f4a44f39f47217b46c85176af28: Build cache: make signed/unsigned a mirror property
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