chore(deps): update davidanson/markdownlint-cli2-action action to v20

.gitea/workflows/auto-release.yaml

@@ -14,7 +14,6 @@ jobs:
   tag_on_change:
     permissions:
       contents: write
-
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5.0.0
@@ -38,35 +37,44 @@ jobs:
         if: steps.check_change.outputs.changed == 'false'
         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'
+        id: get_tag
         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 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
         if: steps.check_change.outputs.changed == 'true'
-        uses: actions/github-script@v8.0.0
+        uses: peter-evans/repository-dispatch@v4.0.0
         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
-                }
-            });

.gitea/workflows/build.yaml

@@ -1,16 +1,11 @@
 name: Build
 
-env:
-  GONOSUMDB: ${{ vars.GONOSUMDB }}
-  GOPRIVATE: ${{ vars.GOPRIVATE }}
-  GOPROXY: ${{ vars.GOPROXY }}
-
 on:
   pull_request:
     types:
-    - opened
+    - "opened"
-    - reopened
+    - "reopened"
-    - synchronize
+    - "synchronize"
   push:
     branches:
     - master
@@ -21,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest-arm64
     steps:
       - uses: actions/checkout@v5.0.0
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@v3.6.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build image
@@ -29,9 +24,6 @@ jobs:
           TAG=latest
 
           docker buildx build \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
             --platform linux/arm64 \
             --file Dockerfile \
             --provenance false \
@@ -42,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest-amd64
     steps:
       - uses: actions/checkout@v5.0.0
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@v3.6.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build image
@@ -50,9 +42,6 @@ jobs:
           TAG=latest
 
           docker buildx build \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
             --platform linux/amd64 \
             --file Dockerfile \
             --provenance false \

.gitea/workflows/release.yaml

@@ -1,18 +1,11 @@
 name: Release
 
-env:
-  GOPROXY: ${{ vars.GOPROXY }}
-
 on:
   push:
     tags:
     - "**"
-  workflow_dispatch:
+  repository_dispatch:
-    inputs:
+    types: [ push-tagged-images ]
-      tag:
-        description: "Tag which should be released"
-        type: string
-        required: true
 
 jobs:
   push-arm64:
@@ -21,21 +14,17 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ inputs.tag || github.ref_name }}"
+          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-
+          echo "Version: ${VERSION}"
-          echo "Version (raw):      ${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "Version (cleaned):  ${VERSION/v/}"
-
-          echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
-          echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
 
       - uses: actions/checkout@v5.0.0
         with:
           fetch-tags: true
-          ref: "${{ steps.version_extraction.outputs.version_raw }}"
+          ref: "${{ steps.version_extraction.outputs.version }}"
 
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@v3.6.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - uses: docker/login-action@v3.6.0
@@ -47,15 +36,11 @@ jobs:
       - name: Build and push image
         run: |
           docker buildx build \
-            --build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
-            --file Dockerfile \
             --platform linux/arm64 \
+            --file Dockerfile \
             --provenance false \
+            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64 \
             --push \
-            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64 \
             .
 
   push-amd64:
@@ -64,21 +49,17 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ inputs.tag || github.ref_name }}"
+          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-
+          echo "Version: ${VERSION}"
-          echo "Version (raw):      ${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "Version (cleaned):  ${VERSION/v/}"
-
-          echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
-          echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
 
       - uses: actions/checkout@v5.0.0
         with:
           fetch-tags: true
-          ref: "${{ steps.version_extraction.outputs.version_raw }}"
+          ref: "${{ steps.version_extraction.outputs.version }}"
 
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@v3.6.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - uses: docker/login-action@v3.6.0
@@ -90,15 +71,11 @@ jobs:
       - name: Build and push image
         run: |
           docker buildx build \
-            --build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
-            --file Dockerfile \
             --platform linux/amd64 \
+            --file Dockerfile \
             --provenance false \
+            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-amd64 \
             --push \
-            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \
             .
 
   push-manifest:
@@ -110,14 +87,10 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ inputs.tag || github.ref_name }}"
+          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-
+          echo "Version: ${VERSION}"
-          echo "Version (raw):      ${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "Version (cleaned):  ${VERSION/v/}"
-
-          echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
-          echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
 
       - uses: docker/login-action@v3.6.0
         with:
@@ -127,11 +100,11 @@ jobs:
 
       - name: Create and push manifest
         run: |
-          docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \
+          docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }} \
-            --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \
+            --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-amd64 \
-            --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64
+            --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64
 
-          docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}
+          docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}
 
   sync-to-hub-docker-io:
     needs:
@@ -141,17 +114,15 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ inputs.tag || github.ref_name }}"
+          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-
+          echo "Version: ${VERSION}"
-          echo "Version (raw):      ${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "Version (cleaned):  ${VERSION/v/}"
-
-          echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
-          echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
 
       - name: Copy images to docker.io
         run: |
+          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
+
           apt-get update --yes
           apt-get install --yes skopeo
           skopeo copy \
@@ -160,5 +131,5 @@ jobs:
             --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \
             --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
             --src-username volker.raschek \
-              docker://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \
+              docker://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }} \
-              docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}
+              docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version }}

Dockerfile

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

Makefile

@@ -1,6 +1,6 @@
 # DC_VERSION
 # Only required to install a specify version
-DC_VERSION?=v2.40.3 # renovate: datasource=github-releases depName=docker/compose
+DC_VERSION?=v2.40.2 # renovate: datasource=github-releases depName=docker/compose
 
 # CONTAINER_RUNTIME
 # 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_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
 # =====================================================================================================================
 PHONY:=container-image/build
 container-image/build:
 	${CONTAINER_RUNTIME} build \
 		--build-arg DC_VERSION=${DC_VERSION} \
-		--build-arg GONOSUMDB=${GONOSUMDB} \
-		--build-arg GOPRIVATE=${GOPRIVATE} \
-		--build-arg GOPROXY=${GOPROXY} \
 		--file Dockerfile \
 		--no-cache \
 		--pull \

README.md

@@ -11,12 +11,12 @@ The workflow or how `docker-compose` can in general be used is documented at
 image.
 
 ```bash
-IMAGE_VERSION=2.40.3
+IMAGE_VERSION=2.40.2
 docker run \
   --rm \
-  --volume "$(pwd):$(pwd)" \
+  --volume ./path/to/docker-compose.yml:/workdir/docker-compose.yml:ro \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  --workdir "$(pwd)" \
+  --workdir /workdir \
-    "git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION}" \
+    git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION} \
-      version
+      ps
 ```