Fix the CI on gitlab.com

idiap · Oct 18, 2024 · 6763f7b · 6763f7b
1 parent 91da14b
commit 6763f7b
Showing 1 changed file with 5 additions and 40 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,57 +1,23 @@
-image: docker:latest
-
-
 default:
   tags:
-    - linux
-    - docker
-    - gitlab-org
     - gitlab-org-docker
+  image: docker:24.0.5
+  services:
+    - docker:24.0.5-dind
 
 
 stages:
   - docker-images
   - build
 
 
-
 variables:
   IMAGES_PREFIX: $CI_REGISTRY_IMAGE/env_
-
-
-.generate-minimal-dockerfile:
-  variables:
-    DOCKERFILE: "ci/Dockerfile"
-  services:
-    - docker:dind
-  before_script:
-    - mkdir -p ci
-    - |
-        cat <<EOT >> $DOCKERFILE
-          ARG BASE_IMAGE=gcc:13-bookworm
-          FROM \$BASE_IMAGE
-
-          RUN set -xe \
-            && apt-get update \
-            && apt-get install -y cmake
-
-          RUN set -xe \
-            && cd /tmp \
-            && wget https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz \
-            && tar xzf eigen-3.4.0.tar.gz \
-            && cd eigen-3.4.0 \
-            && mkdir build \
-            && cd build \
-            && cmake .. \
-            && make install \
-            && cd ../.. \
-            && rm -rf eigen-3.4.0.tar.gz eigen-3.4.0
-        EOT
+  DOCKERFILE: ".github/docker/Dockerfile"
 
 
 build-docker-images-gcc:
   stage: docker-images
-  extends: .generate-minimal-dockerfile
   variables:
     COMPILER: "gcc"
   script:
@@ -69,7 +35,6 @@ build-docker-images-gcc:
 
 build-docker-images-clang:
   stage: docker-images
-  extends: .generate-minimal-dockerfile
   variables:
     COMPILER: "clang"
   script:
@@ -99,4 +64,4 @@ build-gafro:
       - COMPILER: gcc
         COMPILER_VERSION: [10, 11, 12, 13]
       - COMPILER: clang
-        COMPILER_VERSION: [13, 14, 15, 16]
+        COMPILER_VERSION: [13, 14, 15, 16]