Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • containers/eic_container
  • wdconinc/eic_container
  • tooba/eic_container
3 results
Show changes
Commits on Source (2)
......@@ -102,6 +102,15 @@ RUN git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSP
fi \
&& spack repo add --scope site "${EICSPACK_ROOT}"
## Setup key4hep-spack
ENV KEY4HEPSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/key4hep-spack
ARG KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack"
ARG KEY4HEPSPACK_VERSION="main"
ADD https://api.github.com/repos/${KEY4HEPSPACK_ORGREPO}/commits/${KEY4HEPSPACK_VERSION} /tmp/key4hep-spack.json
RUN git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${KEY4HEPSPACK_ROOT} \
&& git -C ${KEY4HEPSPACK_ROOT} checkout ${KEY4HEPSPACK_VERSION} \
&& spack repo add --scope site "${KEY4HEPSPACK_ROOT}"
## ========================================================================================
## STAGE1: builder
## EIC builder image with spack environment
......
......@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
EICSPACK_VERSION="47645083690b46a2cebd54f92b4648752be5c24d"
EICSPACK_VERSION="1d2956a5f87ada2bf04ed1bdee761baf81b85feb"
## Space-separated list of eic-spack cherry-picks
read -r -d '' EICSPACK_CHERRYPICKS <<- \
......
......@@ -52,6 +52,7 @@ spack:
- py-boto3
- py-dask
- py-deepdiff
- py-epic-capybara
- py-ipython
- py-jinja2
- py-jinja2-cli
......
......@@ -210,6 +210,9 @@ packages:
py-deepdiff:
require:
- '@6.3.0'
py-epic-capybara:
require:
- '@main'
py-ipython:
require:
- '@8.11.0'
......