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
76284b4f
Commit
76284b4f
authored
2 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: use S3 buildcache
parent
4473aa57
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!411
feat: use S3 buildcache
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+4
-0
4 additions, 0 deletions
.gitlab-ci.yml
containers/jug/dev.Dockerfile
+15
-0
15 additions, 0 deletions
containers/jug/dev.Dockerfile
with
19 additions
and
0 deletions
.gitlab-ci.yml
+
4
−
0
View file @
76284b4f
...
@@ -252,6 +252,8 @@ jug_dev:default:
...
@@ -252,6 +252,8 @@ jug_dev:default:
--build-arg EICSPACK_ORGREPO="${EICSPACK_ORGREPO}"
--build-arg EICSPACK_ORGREPO="${EICSPACK_ORGREPO}"
--build-arg EICSPACK_VERSION="${EICSPACK_VERSION}"
--build-arg EICSPACK_VERSION="${EICSPACK_VERSION}"
--build-arg EICSPACK_CHERRYPICKS="${EICSPACK_CHERRYPICKS}"
--build-arg EICSPACK_CHERRYPICKS="${EICSPACK_CHERRYPICKS}"
--build-arg S3_ACCESS_KEY="${S3_ACCESS_KEY}"
--build-arg S3_SECRET_KEY="${S3_SECRET_KEY}"
--build-arg CACHE_BUST=${PACKAGE_HASH}
--build-arg CACHE_BUST=${PACKAGE_HASH}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
...
@@ -266,6 +268,8 @@ jug_dev:default:
...
@@ -266,6 +268,8 @@ jug_dev:default:
--build-arg EICSPACK_ORGREPO="${EICSPACK_ORGREPO}"
--build-arg EICSPACK_ORGREPO="${EICSPACK_ORGREPO}"
--build-arg EICSPACK_VERSION="${EICSPACK_VERSION}"
--build-arg EICSPACK_VERSION="${EICSPACK_VERSION}"
--build-arg EICSPACK_CHERRYPICKS="${EICSPACK_CHERRYPICKS}"
--build-arg EICSPACK_CHERRYPICKS="${EICSPACK_CHERRYPICKS}"
--build-arg S3_ACCESS_KEY="${S3_ACCESS_KEY}"
--build-arg S3_SECRET_KEY="${S3_SECRET_KEY}"
--build-arg CACHE_BUST=${PACKAGE_HASH}
--build-arg CACHE_BUST=${PACKAGE_HASH}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
...
...
This diff is collapsed.
Click to expand it.
containers/jug/dev.Dockerfile
+
15
−
0
View file @
76284b4f
...
@@ -17,6 +17,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
...
@@ -17,6 +17,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
python3
\
python3
\
python3-dev
\
python3-dev
\
python3-distutils
\
python3-distutils
\
python3-boto3
\
python-is-python3
\
python-is-python3
\
&&
rm
-rf
/var/lib/apt/lists/
*
&&
rm
-rf
/var/lib/apt/lists/
*
...
@@ -66,6 +67,20 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
...
@@ -66,6 +67,20 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
&&
spack mirror add docker /var/cache/spack-mirror
\
&&
spack mirror add docker /var/cache/spack-mirror
\
&&
spack mirror list
&&
spack mirror list
## Setup eic-spack buildcache mirrors (FIXME: leaks credentials into layer)
ARG
S3_ACCESS_KEY=""
ARG
S3_SECRET_KEY=""
RUN
--mount
=
type
=
cache,target
=
/var/cache/spack-mirror
\
export
PATH
=
$PATH
:
$SPACK_ROOT
/bin
\
&&
if
[
-n
$S3_ACCESS_KEY
]
;
then
\
spack mirror add
--scope
site
\
--s3-endpoint-url
https://dtn01.sdcc.bnl.gov:9000
\
--s3-access-key-id
${
S3_ACCESS_KEY
}
\
--s3-access-key-secret
${
S3_SECRET_KEY
}
\
eic-spack s3://eictest/EPIC/spack
\
;
fi
\
&&
spack mirror list
## This variable will change whenevery either spack.yaml or our spack package
## This variable will change whenevery either spack.yaml or our spack package
## overrides change, triggering a rebuild
## overrides change, triggering a rebuild
ARG
CACHE_BUST="hash"
ARG
CACHE_BUST="hash"
...
...
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