Remove scope to dependencty container & use duneci runners

.gitlab-ci.yml

@@ -23,48 +23,40 @@ stages:
 # OS setup
 .debian_gcc: &debian_gcc
   <<: *general_definitions
-  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies/debian-gcc-8-17:latest
+  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies:debian-gcc-8-17
   before_script:
     - DUNECI_TOOLCHAIN="gcc-8-17"
     - DUNECI_OS="debian"
     - DUNECI_BASE_IMAGE=${CI_REGISTRY}/docker/ci/debian:10
-    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies/${DUNECI_OS}-${DUNECI_TOOLCHAIN}:latest
-  tags:
-    - "dind"
+    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN}
 
 .debian_clang: &debian_clang
   <<: *general_definitions
-  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies/debian-clang-7-libcpp-17:latest
+  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies:debian-clang-7-libcpp-17
   before_script:
     - DUNECI_TOOLCHAIN="clang-7-libcpp-17"
     - DUNECI_OS="debian"
     - DUNECI_BASE_IMAGE=${CI_REGISTRY}/docker/ci/debian:10
-    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies/${DUNECI_OS}-${DUNECI_TOOLCHAIN}:latest
+    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN}
   allow_failure: true
-  tags:
-    - "dind"
 
 .ubuntu_gcc: &ubuntu_gcc
   <<: *general_definitions
-  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies/ubuntu-gcc-7-17:latest
+  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies:ubuntu-gcc-7-17
   before_script:
     - DUNECI_TOOLCHAIN="gcc-7-17"
     - DUNECI_OS="ubuntu"
     - DUNECI_BASE_IMAGE=${CI_REGISTRY}/docker/ci/ubuntu:18.04
-    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies/${DUNECI_OS}-${DUNECI_TOOLCHAIN}:latest
-  tags:
-    - "dind"
+    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN}
 
 .ubuntu_clang: &ubuntu_clang
   <<: *general_definitions
-  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies/ubuntu-clang-6-17:latest
+  image: ${CI_REGISTRY}/copasi/dune-copasi/dependencies:ubuntu-clang-6-17
   before_script:
     - DUNECI_TOOLCHAIN="clang-6-17"
     - DUNECI_OS="ubuntu"
     - DUNECI_BASE_IMAGE=${CI_REGISTRY}/docker/ci/ubuntu:18.04
-    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies/${DUNECI_OS}-${DUNECI_TOOLCHAIN}:latest
-  tags:
-    - "dind"
+    - DUNE_COPASI_BASE_IMAGE=${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN}
 
 # Stages
 .setup: &setup
@@ -74,9 +66,9 @@ stages:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY/copasi/dune-copasi
     - docker build -f docker/dependencies.dockerfile
         --build-arg BASE_IMAGE=${DUNECI_BASE_IMAGE}
-        -t ${CI_REGISTRY}/copasi/dune-copasi/dependencies/${DUNECI_OS}-${DUNECI_TOOLCHAIN}:latest .
-    - docker push ${CI_REGISTRY}/copasi/dune-copasi/dependencies/${DUNECI_OS}-${DUNECI_TOOLCHAIN}:latest
-    - docker logout $CI_REGISTRY
+        -t ${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN} .
+    - docker push ${CI_REGISTRY}/copasi/dune-copasi/dependencies:${DUNECI_OS}-${DUNECI_TOOLCHAIN}
+    - docker logout $CI_REGISTRY/copasi/dune-copasi
   # only:
   #   - master
 
@@ -120,7 +112,7 @@ stages:
         --build-arg BRANCH=${CI_COMMIT_REF_NAME}
         -t $CI_REGISTRY/copasi/dune-copasi/dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME} .
     - docker push $CI_REGISTRY/copasi/dune-copasi/dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME}
-    - docker logout $CI_REGISTRY
+    - docker logout $CI_REGISTRY/copasi/dune-copasi
   # only:
   #   - master