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

feat: use S3 buildcache

parent 4473aa57
No related branches found
No related tags found
1 merge request!411feat: use S3 buildcache
...@@ -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)
......
...@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment