From 82f663798176e6f0ed9459d8a52097c459a04382 Mon Sep 17 00:00:00 2001 From: morph027 Date: Mon, 27 May 2024 17:02:04 +0200 Subject: [PATCH 1/5] bump docker dind (cgroup error) Signed-off-by: morph027 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6dc12fd..012d3e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ gitea-arm64-trigger: stage: test image: docker:stable services: - - docker:stable-dind + - docker:25-dind variables: DOCKER_TLS_CERTDIR: "" script: @@ -115,7 +115,7 @@ gitea-arm64-trigger: stage: test image: docker:stable services: - - docker:stable-dind + - docker:25-dind variables: DOCKER_TLS_CERTDIR: "" script: From 0c08e9675d1f413a390e646e9835b7a42023c2fc Mon Sep 17 00:00:00 2001 From: morph027 Date: Mon, 27 May 2024 17:07:34 +0200 Subject: [PATCH 2/5] pin docker to 25 Signed-off-by: morph027 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 012d3e6..111a3f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,7 @@ gitea-arm64-trigger: .test-install: &test-install stage: test - image: docker:stable + image: docker:25 services: - docker:25-dind variables: @@ -113,7 +113,7 @@ gitea-arm64-trigger: .test-update: &test-update stage: test - image: docker:stable + image: docker:25 services: - docker:25-dind variables: From b185ebbe9e0bc76cf667b894b58774767fbb2549 Mon Sep 17 00:00:00 2001 From: morph027 Date: Mon, 27 May 2024 17:15:52 +0200 Subject: [PATCH 3/5] pin docker to 19 Signed-off-by: morph027 --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 111a3f2..4b8f05a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,9 +92,9 @@ gitea-arm64-trigger: .test-install: &test-install stage: test - image: docker:25 + image: docker:19 services: - - docker:25-dind + - docker:19-dind variables: DOCKER_TLS_CERTDIR: "" script: @@ -113,9 +113,9 @@ gitea-arm64-trigger: .test-update: &test-update stage: test - image: docker:25 + image: docker:19 services: - - docker:25-dind + - docker:19-dind variables: DOCKER_TLS_CERTDIR: "" script: From 2dbbc72e39ee499965b5565d5f800ffa63c12481 Mon Sep 17 00:00:00 2001 From: morph027 Date: Mon, 27 May 2024 19:18:17 +0200 Subject: [PATCH 4/5] use DOCKER_VERSION to simplify pipeline debugging Signed-off-by: morph027 --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b8f05a..f259dab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,9 +92,9 @@ gitea-arm64-trigger: .test-install: &test-install stage: test - image: docker:19 + image: docker:$DOCKER_VERSION services: - - docker:19-dind + - docker:$DOCKER_VERSION-dind variables: DOCKER_TLS_CERTDIR: "" script: @@ -113,9 +113,9 @@ gitea-arm64-trigger: .test-update: &test-update stage: test - image: docker:19 + image: docker:$DOCKER_VERSION services: - - docker:19-dind + - docker:$DOCKER_VERSION-dind variables: DOCKER_TLS_CERTDIR: "" script: From 76dd90437743831bde7085fea8614c626324f84a Mon Sep 17 00:00:00 2001 From: morph027 Date: Mon, 27 May 2024 21:39:40 +0200 Subject: [PATCH 5/5] use UBUNTU_VERSION to simplify pipeline debugging Signed-off-by: morph027 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f259dab..dffa27a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,7 +108,7 @@ gitea-arm64-trigger: -v $CI_PROJECT_DIR:/src -e CI_PROJECT_DIR=/src -e CI_COMMIT_TAG=$CI_COMMIT_TAG - jrei/systemd-ubuntu:20.04 + jrei/systemd-ubuntu:$UBUNTU_VERSION - docker exec -t systemd-ubuntu /bin/bash /src/.gitlab-ci/test-install.sh .test-update: &test-update @@ -129,7 +129,7 @@ gitea-arm64-trigger: -v $CI_PROJECT_DIR:/src -e CI_PROJECT_DIR=/src -e CI_COMMIT_TAG=$CI_COMMIT_TAG - jrei/systemd-ubuntu:20.04 + jrei/systemd-ubuntu:$UBUNTU_VERSION - docker exec -t systemd-ubuntu /bin/bash /src/.gitlab-ci/test-update.sh test-install-trigger: