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
4f031812
Commit
4f031812
authored
1 year ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: re-add juggler support with upgraded Acts
parent
540aafe8
No related branches found
No related tags found
2 merge requests
!762
feat: re-add juggler support with upgraded Acts
,
!742
staging: v23.12-alpha into master
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
containers/jug/dev.Dockerfile
+3
-0
3 additions, 0 deletions
containers/jug/dev.Dockerfile
with
5 additions
and
0 deletions
.gitlab-ci.yml
+
2
−
0
View file @
4f031812
...
...
@@ -7,6 +7,7 @@ variables:
## Application versions used for the main release
## note: nightly builds will always use the master/main branch
JUGGLER_VERSION
:
"
v11.0.0"
EICRECON_VERSION
:
"
v1.8.0"
## Local registry
...
...
@@ -336,6 +337,7 @@ jug_dev:
--build-arg S3_SECRET_KEY=${S3_SECRET_KEY}
--build-arg JUG_VERSION=${EXPORT_TAG}-${BUILD_TYPE}-$(git rev-parse HEAD)
${IF_BUILD_DEFAULT:+
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
--build-arg EICRECON_VERSION=${EICRECON_VERSION}
}
--build-arg ENV=${ENV}
...
...
This diff is collapsed.
Click to expand it.
containers/jug/dev.Dockerfile
+
3
−
0
View file @
4f031812
...
...
@@ -132,6 +132,8 @@ FROM spack as builder
## Setup our custom environment (secret mount for write-enabled mirror)
COPY
--from=spack-environment . /opt/spack-environment/
ARG
ENV=dev
ARG
JUGGLER_VERSION="main"
ADD
https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json
ARG
EICRECON_VERSION="main"
ADD
https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json
ENV
SPACK_ENV=/opt/spack-environment/${ENV}
...
...
@@ -144,6 +146,7 @@ export CCACHE_DIR=/ccache
spack buildcache update-index local
spack buildcache update-index eics3rw
spack env activate --dir ${SPACK_ENV}
spack add juggler@git.${JUGGLER_VERSION}
spack add eicrecon@git.${EICRECON_VERSION}
spack concretize --fresh --force --quiet
make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw"
...
...
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