From e80bf3abc376fda8e39a2f59e7141208be81d412 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Fri, 26 Sep 2025 02:13:19 +0200 Subject: [PATCH] 1.3.0: ci: rollback change image #1 Signed-off-by: GnomeZworc --- .forgejo/workflows/test.yml | 16 +++++++++++++--- scripts/prepar_test.sh | 11 +---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 4cc5c3e..009f560 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -23,7 +23,6 @@ jobs: ci-test: runs-on: raw container: - image: node:22.20.0-alpine3.22 options: --privileged -v /var/run/docker.sock:/var/run/docker.sock steps: - name: Check out repository @@ -31,8 +30,19 @@ jobs: - name: Install docker-cli run: | - apk update && apk add --no-cache docker-cli - apk add bash + apt-get update + apt-get install -y ca-certificates curl + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + + # Add the repository to Apt sources: + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install -y docker-ce-cli - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/scripts/prepar_test.sh b/scripts/prepar_test.sh index 2db967f..fed653e 100644 --- a/scripts/prepar_test.sh +++ b/scripts/prepar_test.sh @@ -1,16 +1,7 @@ #!/bin/bash - -cat <> /etc/apk/repositories -http://ftp.halifax.rwth-aachen.de/alpine/v3.16/main -http://ftp.halifax.rwth-aachen.de/alpine/v3.16/community -ENDFILE -apk update -apk add docker docker-cli-compose docker version docker compose version -docker load --input "$IMAGE_TYPE-$IMAGE_VERSION-release.tar.gz" -docker tag $CI_REGISTRY_IMAGE:$IMAGE_VERSION-release $IMAGE_TYPE:latest cat < docker-compose.yml version: '3.1' @@ -29,7 +20,7 @@ services: timeout: 5s retries: 5 users: - image: $IMAGE_TYPE + image: users-release volumes: - ./docker/keys:/keys depends_on: