Skip to content
Snippets Groups Projects
Commit 643d9608 authored by Griefed's avatar Griefed :joystick:
Browse files

Merge branch 'develop' into 'main'

Develop

See merge request !23
parents 75f07d87 3aa07bcf
No related branches found
No related tags found
1 merge request!23Develop
Pipeline #9164 passed
......@@ -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:
......
......@@ -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 \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment