diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55c971e461a10889ac6f0de7dbccf6b756e61307..321ebb4dfa8cb610972cb370b88573201c7491ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ workflow:
## plan:
## Workflows:
## - master --> config + all build stages + singularity
-# + nightly jug + nightly singularity
+# + nightly eic + nightly singularity
## - v4.0-stable --> config + all build stages + singularity
## - v4.0.0 --> config + all build stages + singularity
## - MR --> config + all build stages
@@ -245,14 +245,14 @@ status:pending:
- when: never
## Images:
-## debian_testing_base --> jug_dev --> jug_xl
-## ---------------> jug_sim
-## ---------------> jug_ml
-## debian_stable_base --> oneapi_jug_dev
-## oneapi_jug_dev + jug_xl --> oneapi_jug_xl
+## debian_testing_base --> eic_dev --> eic_xl
+## ---------------> eic_sim
+## ---------------> eic_ml
+## debian_stable_base --> oneapi_eic_dev
+## oneapi_jug_dev + eic_xl --> oneapi_eic_xl
## TODO
-## oneapi_runtime + jug_xl --> oneapi_prod
+## oneapi_runtime + eic_xl --> oneapi_prod
base:
parallel:
@@ -293,7 +293,7 @@ base:
${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
}
- --file containers/debian/base.Dockerfile
+ --file containers/debian/Dockerfile
--platform ${PLATFORM}
--build-arg BASE_IMAGE=${BASE_IMAGE}
--build-arg BUILD_IMAGE=${BUILD_IMAGE}
@@ -390,7 +390,6 @@ eic:
- while !
docker buildx build --push ${BUILD_OPTIONS} ${nocache}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
- --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE/eic/jug}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
${EXPORT_TAG:+
${IF_BUILD_DEFAULT+
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}}
@@ -414,30 +413,7 @@ eic:
}
}
}
- ${EXPORT_TAG:+
- ${IF_BUILD_DEFAULT+
- ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE/eic/jug}${ENV}:${EXPORT_TAG}}
- ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${EXPORT_TAG}}
- ${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${EXPORT_TAG}}
- }
- ${IF_BUILD_DEFAULT-
- ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE/eic/jug}${ENV}:${EXPORT_TAG}-${BUILD_TYPE}}
- ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${EXPORT_TAG}-${BUILD_TYPE}}
- ${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${EXPORT_TAG}-${BUILD_TYPE}}
- }
- }
- ${IF_BUILD_NIGHTLY+
- ${NIGHTLY:+
- ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE/eic/jug}${ENV}:${NIGHTLY_TAG}}
- ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${NIGHTLY_TAG}}
- ${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${NIGHTLY_TAG}}
- }
- ${PUSH_NIGHTLY_WITH_DATE:+
- ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${NIGHTLY_TAG}-$(date +%Y-%m-%d)}
- ${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE/eic/jug}${ENV}:${NIGHTLY_TAG}-$(date +%Y-%m-%d)}
- }
- }
- --file containers/jug/dev.Dockerfile
+ --file containers/eic/Dockerfile
--platform ${PLATFORM}
--build-arg DOCKER_REGISTRY=${CI_REGISTRY}/${CI_PROJECT_PATH}/
--build-arg BUILDER_IMAGE=${BUILDER_IMAGE}
@@ -465,7 +441,7 @@ eic:
--secret type=env,id=GITHUB_REGISTRY_USER,env=GITHUB_REGISTRY_USER
--secret type=env,id=GITHUB_REGISTRY_TOKEN,env=GITHUB_REGISTRY_TOKEN
--provenance false
- containers/jug
+ containers/eic
2>&1 | tee build.log
; do
if grep "unknown blob" build.log ; then
diff --git a/containers/debian/base.Dockerfile b/containers/debian/Dockerfile
similarity index 99%
rename from containers/debian/base.Dockerfile
rename to containers/debian/Dockerfile
index 3678f404d06d4438d28328973c991c0b9e8ca8b0..c8423d69955e42d4e9cc9aecc9a10000a7e944e2 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/Dockerfile
@@ -145,7 +145,7 @@ EOF
## Setup spack
ENV SPACK_ROOT=/opt/spack
ARG SPACK_ORGREPO="spack/spack"
-ARG SPACK_VERSION="releases/v0.20"
+ARG SPACK_VERSION="releases/latest"
ENV SPACK_PYTHON=/usr/bin/python3
ARG SPACK_CHERRYPICKS=""
ARG SPACK_CHERRYPICKS_FILES=""
@@ -224,7 +224,7 @@ EOF
## Setup eic-spack
ENV EICSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/eic-spack
ARG EICSPACK_ORGREPO="eic/eic-spack"
-ARG EICSPACK_VERSION="$SPACK_VERSION"
+ARG EICSPACK_VERSION="develop"
ADD https://api.github.com/repos/${EICSPACK_ORGREPO}/commits/${EICSPACK_VERSION} /tmp/eic-spack.json
RUN <<EOF
set -e
diff --git a/containers/debian/README.md b/containers/debian/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..46aaf43bdcd4268cddc4a8f8b48b8732ac019fa1
--- /dev/null
+++ b/containers/debian/README.md
@@ -0,0 +1,5 @@
+To build the container in this directory:
+
+```
+docker buildx build -f Dockerfile .
+```
diff --git a/containers/jug/dev.Dockerfile b/containers/eic/Dockerfile
similarity index 99%
rename from containers/jug/dev.Dockerfile
rename to containers/eic/Dockerfile
index 4fe6696c0ba8afc65676b1bc5cf2bb8a1127ad65..4006073579556a9b5b5dad6f6f862f5d3f37989b 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/eic/Dockerfile
@@ -3,7 +3,7 @@
ARG DOCKER_REGISTRY="eicweb/"
ARG BUILDER_IMAGE="debian_stable_base"
ARG RUNTIME_IMAGE="debian_stable_base"
-ARG INTERNAL_TAG="testing"
+ARG INTERNAL_TAG="master"
##
## This docker build follows two tracks, in order to ensure that we build all packages
@@ -39,7 +39,7 @@ ARG TARGETPLATFORM
## Copy our default environment
COPY --from=spack-environment . /opt/spack-environment/
-ARG ENV=dev
+ARG ENV=xl
ENV SPACK_ENV=/opt/spack-environment/${ENV}
# Concretization (default environment)
@@ -88,7 +88,7 @@ ARG TARGETPLATFORM
## Copy our default environment
COPY --from=spack-environment . /opt/spack-environment/
-ARG ENV=dev
+ARG ENV=xl
ENV SPACK_ENV=/opt/spack-environment/${ENV}
RUN echo -e "\n view: false" >> ${SPACK_ENV}/spack.yaml
diff --git a/containers/eic/README.md b/containers/eic/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..859d7466e9d710ba762b57c112645eb4a22cc6fa
--- /dev/null
+++ b/containers/eic/README.md
@@ -0,0 +1,5 @@
+To build the container in this directory:
+
+```
+docker buildx build -f Dockerfile --build-context spack-environment=../../spack-environment .
+```
diff --git a/containers/jug/eic-env.sh b/containers/eic/eic-env.sh
similarity index 100%
rename from containers/jug/eic-env.sh
rename to containers/eic/eic-env.sh
diff --git a/containers/jug/eic-info b/containers/eic/eic-info
similarity index 100%
rename from containers/jug/eic-info
rename to containers/eic/eic-info
diff --git a/containers/jug/eic-news b/containers/eic/eic-news
similarity index 100%
rename from containers/jug/eic-news
rename to containers/eic/eic-news
diff --git a/containers/jug/eic-shell b/containers/eic/eic-shell
similarity index 100%
rename from containers/jug/eic-shell
rename to containers/eic/eic-shell
diff --git a/containers/jug/entrypoint.sh b/containers/eic/entrypoint.sh
similarity index 100%
rename from containers/jug/entrypoint.sh
rename to containers/eic/entrypoint.sh
diff --git a/containers/jug/profile.d/a00_cleanup.sh b/containers/eic/profile.d/a00_cleanup.sh
similarity index 100%
rename from containers/jug/profile.d/a00_cleanup.sh
rename to containers/eic/profile.d/a00_cleanup.sh
diff --git a/containers/jug/profile.d/z11_jug_env.sh b/containers/eic/profile.d/z11_jug_env.sh
similarity index 100%
rename from containers/jug/profile.d/z11_jug_env.sh
rename to containers/eic/profile.d/z11_jug_env.sh
diff --git a/containers/jug/singularity.d/env/99-zz_jug_env.sh b/containers/eic/singularity.d/env/99-zz_jug_env.sh
similarity index 100%
rename from containers/jug/singularity.d/env/99-zz_jug_env.sh
rename to containers/eic/singularity.d/env/99-zz_jug_env.sh