From e210eb1271d2986dfc644b45feab58d26e17dde8 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Fri, 17 Jan 2025 22:54:46 +0100
Subject: [PATCH 1/5] fix: Bump to alpine v3.20 for nodejs 20
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 35de341..c3c5069 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 \
--
GitLab
From 4ab1a1f3e6ecde17cbe4281342936c062ac0db64 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Fri, 17 Jan 2025 22:55:34 +0100
Subject: [PATCH 2/5] deps: Bump dind to 27.5.0-dind
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c3c5069..fd52f8f 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."
--
GitLab
From eecbda205227adb3a14908d60108763b1e4a4c55 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Fri, 17 Jan 2025 22:57:13 +0100
Subject: [PATCH 3/5] ci: Move to GHCR
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b072c2..9080781 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
--
GitLab
From 9cab74b9a85ef58bc577bcb1d59bfdcc35ac2a2c Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Fri, 17 Jan 2025 23:22:38 +0100
Subject: [PATCH 4/5] build: Deprecate armv7
---
.gitlab-ci.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9080781..bb5be31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
@@ -42,6 +42,10 @@ test docker:
variables:
- '$CI_COMMIT_TITLE =~ /^RELEASE:.+$/ || $CI_PIPELINE_SOURCE == "schedule"'
+test semantic-release:
+ stage: test
+
+
release:
needs: ['test docker']
stage: release
--
GitLab
From 3aa07bcf2b2ca30a0252d7715bc6ffe38ac37b96 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Fri, 17 Jan 2025 23:23:36 +0100
Subject: [PATCH 5/5] ci: Fix yaml by removing derp block
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb5be31..8a42beb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,6 @@ test docker:
variables:
- '$CI_COMMIT_TITLE =~ /^RELEASE:.+$/ || $CI_PIPELINE_SOURCE == "schedule"'
-test semantic-release:
- stage: test
-
-
release:
needs: ['test docker']
stage: release
--
GitLab