diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b072c2c12c74adcfd93e7a2b1b14ca845faf72e..8a42beb1c0472566a34dcf5c8a73af4855be2251 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,10 @@ stages: - build services: - - name: docker.griefed.dev/griefed/gitlab-ci-cd:2.2.12 + - name: ghcr.io/griefed/gitlab-ci-cd:2.2.12 alias: docker -image: docker.griefed.dev/griefed/gitlab-ci-cd:2.2.12 +image: ghcr.io/griefed/gitlab-ci-cd:2.2.12 variables: project_name: $CI_PROJECT_NAME @@ -33,7 +33,7 @@ test docker: - docker buildx build --push --no-cache - --platform linux/amd64,linux/arm64,linux/arm/v7 + --platform linux/amd64,linux/arm64 --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop-$CI_COMMIT_SHORT_SHA" --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop-$CI_COMMIT_SHORT_SHA" . except: diff --git a/Dockerfile b/Dockerfile index 35de341c4a6e49e159af05175a5be2c3dc947317..fd52f8ffda1d4dd28bbc2ab0eef3ba52d3de82e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN \ chmod a+x \ /discord.sh -FROM mazzolino/docker:20.10.12-dind +FROM docker:27.5.0-dind LABEL maintainer="Griefed <griefed@griefed.de>" LABEL description="Provides GitLab Semantic Release, buildx, JDK 8, NodeJS for Griefed's GitLab CI/CD pipelines." @@ -34,7 +34,7 @@ RUN \ apk update && \ apk upgrade && \ apk add --no-cache \ - --repository https://dl-cdn.alpinelinux.org/alpine/v3.17/main/ \ + --repository https://dl-cdn.alpinelinux.org/alpine/v3.20/main/ \ nodejs \ npm && \ apk add --no-cache \