.gitlab-ci.yml

@@ -47,7 +47,6 @@ variables:
 
 stages:
   - config
-  - dind
   - base            ## base OS image
   - jug             ## jug container images
   - deploy          ## build/deploy singularity images
@@ -204,42 +203,6 @@ version:
 ## TODO
 ## oneapi_runtime + jug_xl --> oneapi_prod 
 
-## Docker-in-docker image
-dind-build:
-  parallel:
-    matrix:
-      - BUILD_IMAGE: dind
-  extends: .build
-  stage: dind
-  needs:
-    - version
-  script:
-    - docker buildx build --push
-        --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}     
-        --file containers/dind/Dockerfile
-        containers/dind
-
-dind-publish:
-  image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
-  parallel:
-    matrix:
-      - BUILD_IMAGE: dind
-  extends: .build
-  stage: dind
-  needs:
-    - version
-    - dind-build
-  script:
-    - docker buildx build --push
-        --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
-        ${EXPORT_TAG:+
-          ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
-          ${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/dind/Dockerfile
-        containers/dind
-
 base:
   parallel:
     matrix:
@@ -562,7 +525,6 @@ clean:
       if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
         ./gitlab-ci/cleanup_registry.sh -i jug_xl -r 69 ${NIGHTLY_TAG}
       fi
-    - ./gitlab-ci/cleanup_registry.sh -i dind -r 93 ${INTERNAL_TAG}
 
 clean_unstable_mr:
   extends: .docker

containers/jug/dev.Dockerfile

@@ -136,21 +136,6 @@ RUN --mount=type=cache,target=/var/cache/spack,sharing=locked           \
     [ -z "${CACHE_NUKE}" ]                                              \
     || rm -rf /var/cache/spack/mirror/${SPACK_VERSION}/build_cache/*
 
-## Extra post-spack steps:
-##   - Python packages
-COPY requirements.txt /usr/local/etc/requirements.txt
-RUN --mount=type=cache,target=/var/cache/pip,sharing=locked,id=${TARGETPLATFORM} \
-    echo "Installing additional python packages"                        \
- && source $SPACK_ROOT/share/spack/setup-env.sh                         \
- && spack env activate --dir ${SPACK_ENV}                               \
- && python -m pip install                                               \
-    --trusted-host pypi.org                                             \
-    --trusted-host files.pythonhosted.org                               \
-    --cache-dir /var/cache/pip                                          \
-    --requirement /usr/local/etc/requirements.txt                       \
-    --no-warn-script-location
-    # ^ Supress not on PATH Warnings
-
 ## Including some small fixes
 RUN echo "Grabbing environment info"                                    \
  && spack env activate --sh --dir ${SPACK_ENV}                          \

containers/jug/requirements.txt

-pyunfold