gitlab-ci: Pull docker images from ghc/ci-images registry

(cherry picked from commit b90695cdaaa0995c1b7a26289c63be9f9e9cfe3e)

1 files changed, 13 insertions, 11 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35aee09192..1589bc15a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 variables:
   GIT_SSL_NO_VERIFY: "1"
+  # Commit of ghc/ci-images repository from which to pull Docker images
+  DOCKER_REV: 2757db588256b0f96dd44d602f0857ae8f86a704
 
 before_script:
   - python3 .gitlab/fix-submodules.py
@@ -30,7 +32,7 @@ stages:
 
 ghc-linters:
   stage: lint
-  image: ghcci/linters:0.1
+  image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV"
   script:
     - |
       if [ -n "$CI_MERGE_REQUEST_ID" ]; then
@@ -65,7 +67,7 @@ ghc-linters:
 validate-x86_64-linux-deb8-hadrian:
   extends: .validate-hadrian
   stage: build
-  image: ghcci/x86_64-linux-deb8:0.1
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb8:$DOCKER_REV"
   before_script:
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
@@ -165,7 +167,7 @@ validate-x86_64-darwin:
 validate-aarch64-linux-deb9:
   extends: .validate-linux
   stage: full-build
-  image: ghcci/aarch64-linux-deb9:0.1
+  image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb9:$DOCKER_REV"
   allow_failure: true
   artifacts:
     when: always
@@ -189,7 +191,7 @@ nightly-aarch64-linux-deb9:
 validate-i386-linux-deb9:
   extends: .validate-linux
   stage: full-build
-  image: ghcci/i386-linux-deb9:0.1
+  image: "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV"
   allow_failure: true
   artifacts:
     when: always
@@ -200,7 +202,7 @@ validate-i386-linux-deb9:
 nightly-i386-linux-deb9:
   extends: .validate-linux
   stage: full-build
-  image: ghcci/i386-linux-deb9:0.1
+  image: "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV"
   allow_failure: true
   variables:
     TEST_TYPE: slowtest
@@ -216,7 +218,7 @@ nightly-i386-linux-deb9:
 validate-x86_64-linux-deb9:
   extends: .validate-linux
   stage: build
-  image: ghcci/x86_64-linux-deb9:0.2
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
   artifacts:
     when: always
     expire_in: 2 week
@@ -238,7 +240,7 @@ validate-x86_64-linux-deb9-llvm:
   extends: .validate-linux
   stage: full-build
   allow_failure: true
-  image: ghcci/x86_64-linux-deb9:0.2
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
   variables:
     BUILD_FLAVOUR: perf-llvm
   cache:
@@ -247,7 +249,7 @@ validate-x86_64-linux-deb9-llvm:
 validate-x86_64-linux-deb8:
   extends: .validate-linux
   stage: full-build
-  image: ghcci/x86_64-linux-deb8:0.1
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb8:$DOCKER_REV"
   cache:
     key: linux-x86_64-deb8
   artifacts:
@@ -257,7 +259,7 @@ validate-x86_64-linux-deb8:
 validate-x86_64-linux-fedora27:
   extends: .validate-linux
   stage: full-build
-  image: ghcci/x86_64-linux-fedora27:0.1
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
   cache:
     key: linux-x86_64-fedora27
   artifacts:
@@ -270,7 +272,7 @@ validate-x86_64-linux-deb9-integer-simple:
   allow_failure: true
   variables:
     INTEGER_LIBRARY: integer-simple
-  image: ghcci/x86_64-linux-deb9:0.2
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
   cache:
     key: linux-x86_64-deb9
 
@@ -292,7 +294,7 @@ validate-x86_64-linux-deb9-unreg:
   allow_failure: true
   variables:
     CONFIGURE_ARGS: --enable-unregisterised
-  image: ghcci/x86_64-linux-deb9:0.2
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
   cache:
     key: linux-x86_64-deb9