Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gitlab-ci-cd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Prosper
gitlab-ci-cd
Commits
643d9608
Commit
643d9608
authored
2 months ago
by
Griefed
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into 'main'
Develop See merge request
!23
parents
75f07d87
3aa07bcf
No related branches found
No related tags found
1 merge request
!23
Develop
Pipeline
#9164
passed
2 months ago
Stage: test
Stage: release
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
.gitlab-ci.yml
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
with
5 additions
and
5 deletions
.gitlab-ci.yml
+
3
−
3
View file @
643d9608
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
2
View file @
643d9608
...
...
@@ -19,7 +19,7 @@ RUN \
chmod
a+x
\
/discord.sh
FROM
mazzolino/
docker:2
0.10.12
-dind
FROM
docker:2
7.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
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment