Compare commits

..

1 Commits

Author SHA1 Message Date
36b652da03 chore(deps): update davidanson/markdownlint-cli2-action action to v20
Some checks failed
Lint Markdown files / markdown-lint (pull_request) Has been cancelled
Build / build-arm64 (pull_request) Has been cancelled
Build / build-amd64 (pull_request) Has been cancelled
2025-10-22 22:24:29 +02:00
8 changed files with 45 additions and 68 deletions

View File

@@ -14,7 +14,6 @@ jobs:
tag_on_change: tag_on_change:
permissions: permissions:
contents: write contents: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v5.0.0 - uses: actions/checkout@v5.0.0
@@ -38,34 +37,44 @@ jobs:
if: steps.check_change.outputs.changed == 'false' if: steps.check_change.outputs.changed == 'false'
run: echo "No DC_VERSION change. Exiting..." run: echo "No DC_VERSION change. Exiting..."
- name: Create and push new tag - name: Get latest tag
id: create_tag
if: steps.check_change.outputs.changed == 'true' if: steps.check_change.outputs.changed == 'true'
id: get_tag
run: | run: |
defined_tag="$(grep --only-matching --perl-regexp 'DC_VERSION\?=v?[\d]*(\.[\d]*){0,2}' Makefile | cut --delimiter='=' --fields=2)" latest_tag=$(git tag --sort=-v:refname | grep --extended-regexp '^v[0-9]+\.[0-9]+\.[0-9]+$' | head --lines 1 || echo "0.0.0")
echo "latest_tag=$latest_tag" >> $GITHUB_OUTPUT
echo "Latest tag: $latest_tag"
echo "defined_tag=${defined_tag}" >> $GITHUB_OUTPUT
echo "New tag: ${defined_tag}"
git config --local user.name "${GIT_USER}" - name: Increment patch version
if: steps.check_change.outputs.changed == 'true'
id: bump
run: |
latest_tag=${{ steps.get_tag.outputs.latest_tag }}
IFS='.' read -r major minor patch <<< "$latest_tag"
patch=$((patch + 1))
new_tag="${major}.${minor}.${patch}"
echo "new_tag=$new_tag" >> $GITHUB_OUTPUT
echo "New tag: $new_tag"
- name: Create and push new tag
if: steps.check_change.outputs.changed == 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
new_tag=${{ steps.bump.outputs.new_tag }}
git config --local user.name "${GIT_USERNAME}"
git config --local user.email "${GIT_EMAIL}" git config --local user.email "${GIT_EMAIL}"
git tag -a "${defined_tag}" -m "${defined_tag}" git tag -a "${new_tag}" -m "${new_tag}"
git push origin "${defined_tag}" git push origin "${new_tag}"
- name: Trigger "Push tagged images" workflow - name: Trigger "Push tagged images" workflow
uses: actions/github-script@v8.0.0 if: steps.check_change.outputs.changed == 'true'
uses: peter-evans/repository-dispatch@v4.0.0
with: with:
script: | token: ${{ secrets.GITHUB_TOKEN }}
const workflowFileName = 'release.yaml'; event-type: push-tagged-images
const defaultBranch = context.payload.repository.default_branch; client-payload: |
const definedTag = '${{ steps.create_tag.outputs.defined_tag }}'; {
"tag": "${{ steps.bump.outputs.new_tag }}"
await github.rest.actions.createWorkflowDispatch({ }
owner: context.repo.owner,
repo: context.repo.repo,
workflow_id: workflowFileName,
ref: defaultBranch,
inputs: {
tag: definedTag
}
});

View File

@@ -1,8 +1,5 @@
name: Build name: Build
env:
GOPROXY: ${{ var.GOPROXY }}
on: on:
pull_request: pull_request:
types: types:
@@ -27,9 +24,6 @@ jobs:
TAG=latest TAG=latest
docker buildx build \ docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/arm64 \ --platform linux/arm64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \
@@ -48,9 +42,6 @@ jobs:
TAG=latest TAG=latest
docker buildx build \ docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/amd64 \ --platform linux/amd64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \

View File

@@ -16,6 +16,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v5.0.0 - uses: actions/checkout@v5.0.0
- uses: DavidAnson/markdownlint-cli2-action@v19.1.0 - uses: DavidAnson/markdownlint-cli2-action@v20.0.0
with: with:
globs: '**/*.md' globs: '**/*.md'

View File

@@ -1,18 +1,11 @@
name: Release name: Release
env:
GOPROXY: ${{ var.GOPROXY }}
on: on:
push: push:
tags: tags:
- "**" - "**"
workflow_dispatch: repository_dispatch:
inputs: types: [ push-tagged-images ]
tag:
description: "Tag which should be released"
type: string
required: true
jobs: jobs:
push-arm64: push-arm64:
@@ -21,7 +14,7 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}" echo "Version: ${VERSION}"
echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "version=${VERSION}" >> $GITHUB_OUTPUT
@@ -43,9 +36,6 @@ jobs:
- name: Build and push image - name: Build and push image
run: | run: |
docker buildx build \ docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/arm64 \ --platform linux/arm64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \
@@ -59,7 +49,7 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}" echo "Version: ${VERSION}"
echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "version=${VERSION}" >> $GITHUB_OUTPUT
@@ -81,9 +71,6 @@ jobs:
- name: Build and push image - name: Build and push image
run: | run: |
docker buildx build \ docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/amd64 \ --platform linux/amd64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \
@@ -100,7 +87,7 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}" echo "Version: ${VERSION}"
echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "version=${VERSION}" >> $GITHUB_OUTPUT
@@ -127,7 +114,7 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}" echo "Version: ${VERSION}"
echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "version=${VERSION}" >> $GITHUB_OUTPUT

View File

@@ -1,9 +1,6 @@
FROM docker.io/library/golang:1.25.3-alpine3.21 AS build FROM docker.io/library/golang:1.25.3-alpine3.21 AS build
ARG DC_VERSION=main ARG DC_VERSION=main
ARG GONOSUMDB
ARG GOPRIVATE
ARG GOPROXY
RUN set -ex && \ RUN set -ex && \
apk update && \ apk update && \

View File

@@ -1,6 +1,6 @@
# DC_VERSION # DC_VERSION
# Only required to install a specify version # Only required to install a specify version
DC_VERSION?=v2.40.2 # renovate: datasource=github-releases depName=docker/compose DC_VERSION?=v2.40.0 # renovate: datasource=github-releases depName=docker/compose
# CONTAINER_RUNTIME # CONTAINER_RUNTIME
# The CONTAINER_RUNTIME variable will be used to specified the path to a container runtime. This is needed to start and # The CONTAINER_RUNTIME variable will be used to specified the path to a container runtime. This is needed to start and
@@ -17,20 +17,12 @@ DC_IMAGE_NAME:=docker-compose
DC_IMAGE_VERSION?=latest DC_IMAGE_VERSION?=latest
DC_IMAGE_FULLY_QUALIFIED=${DC_IMAGE_REGISTRY_NAME}/${DC_IMAGE_NAMESPACE}/${DC_IMAGE_NAME}:${DC_IMAGE_VERSION} DC_IMAGE_FULLY_QUALIFIED=${DC_IMAGE_REGISTRY_NAME}/${DC_IMAGE_NAMESPACE}/${DC_IMAGE_NAME}:${DC_IMAGE_VERSION}
# Golang related environment variables
GONOSUMDB?=
GOPRIVATE?=
GOPROXY?=
# BUILD CONTAINER IMAGE # BUILD CONTAINER IMAGE
# ===================================================================================================================== # =====================================================================================================================
PHONY:=container-image/build PHONY:=container-image/build
container-image/build: container-image/build:
${CONTAINER_RUNTIME} build \ ${CONTAINER_RUNTIME} build \
--build-arg DC_VERSION=${DC_VERSION} \ --build-arg DC_VERSION=${DC_VERSION} \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \ --file Dockerfile \
--no-cache \ --no-cache \
--pull \ --pull \

View File

@@ -11,7 +11,7 @@ The workflow or how `docker-compose` can in general be used is documented at
image. image.
```bash ```bash
IMAGE_VERSION=2.40.2 IMAGE_VERSION=2.34.0
docker run \ docker run \
--rm \ --rm \
--volume ./path/to/docker-compose.yml:/workdir/docker-compose.yml:ro \ --volume ./path/to/docker-compose.yml:/workdir/docker-compose.yml:ro \

View File

@@ -9,8 +9,9 @@
"matchStrings": [ "matchStrings": [
"IMAGE_VERSION=(?<currentValue>.*)" "IMAGE_VERSION=(?<currentValue>.*)"
], ],
"datasourceTemplate": "github-releases", "datasourceTemplate": "docker",
"depNameTemplate": "docker/compose", "depNameTemplate": "volker.raschek/docker-compose",
"lookupNameTemplate": "git.cryptic.systems/volker.raschek/docker-compose",
"versioningTemplate": "semver" "versioningTemplate": "semver"
} }
], ],