fix(ci): trigger push tagged images workflow based on condition

This reverts commit 7edacb5a6c.

.gitea/workflows/auto-release.yaml

@@ -14,6 +14,7 @@ jobs:
   tag_on_change:
     permissions:
       contents: write
+
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5.0.0
@@ -37,44 +38,35 @@ jobs:
         if: steps.check_change.outputs.changed == 'false'
         run: echo "No DC_VERSION change. Exiting..."
 
-      - name: Get latest tag
-        if: steps.check_change.outputs.changed == 'true'
-        id: get_tag
-        run: |
-          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"
-
-
-      - 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
+        id: create_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}"
+          defined_tag="$(grep --only-matching --perl-regexp 'DC_VERSION\?=v?[\d]*(\.[\d]*){0,2}' Makefile | cut --delimiter='=' --fields=2)"
+
+          echo "defined_tag=${defined_tag}" >> $GITHUB_OUTPUT
+          echo "New tag: ${defined_tag}"
+
+          git config --local user.name "${GIT_USER}"
           git config --local user.email "${GIT_EMAIL}"
-          git tag -a "${new_tag}" -m "${new_tag}"
-          git push origin "${new_tag}"
+          git tag -a "${defined_tag}" -m "${defined_tag}"
+          git push origin "${defined_tag}"
 
       - name: Trigger "Push tagged images" workflow
         if: steps.check_change.outputs.changed == 'true'
-        uses: peter-evans/repository-dispatch@v4.0.0
+        uses: actions/github-script@v8.0.0
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          event-type: push-tagged-images
-          client-payload: |
-            {
-              "tag": "${{ steps.bump.outputs.new_tag }}"
+          script: |
+            const workflowFileName = 'release.yaml';
+            const defaultBranch = context.payload.repository.default_branch;
+            const definedTag = '${{ steps.create_tag.outputs.defined_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,11 +1,16 @@
 name: Build
 
+env:
+  GONOSUMDB: ${{ vars.GONOSUMDB }}
+  GOPRIVATE: ${{ vars.GOPRIVATE }}
+  GOPROXY: ${{ vars.GOPROXY }}
+
 on:
   pull_request:
     types:
-    - "opened"
-    - "reopened"
-    - "synchronize"
+    - opened
+    - reopened
+    - synchronize
   push:
     branches:
     - master
@@ -16,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest-arm64
     steps:
       - uses: actions/checkout@v5.0.0
-      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-qemu-action@v3.7.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build image
@@ -24,6 +29,9 @@ 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 \
@@ -34,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest-amd64
     steps:
       - uses: actions/checkout@v5.0.0
-      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-qemu-action@v3.7.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build image
@@ -42,6 +50,9 @@ 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/markdown-linters.yaml

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

.gitea/workflows/release.yaml

@@ -1,11 +1,18 @@
 name: Release
 
+env:
+  GOPROXY: ${{ vars.GOPROXY }}
+
 on:
   push:
     tags:
     - "**"
-  repository_dispatch:
-    types: [ push-tagged-images ]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Tag which should be released"
+        type: string
+        required: true
 
 jobs:
   push-arm64:
@@ -14,17 +21,21 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
+          VERSION="${{ inputs.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+
+          echo "Version (raw):      ${VERSION}"
+          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 }}"
+          ref: "${{ steps.version_extraction.outputs.version_raw }}"
 
-      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-qemu-action@v3.7.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - uses: docker/login-action@v3.6.0
@@ -36,11 +47,15 @@ jobs:
       - name: Build and push image
         run: |
           docker buildx build \
-            --platform linux/arm64 \
+            --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 \
             --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:
@@ -49,17 +64,21 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
+          VERSION="${{ inputs.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+
+          echo "Version (raw):      ${VERSION}"
+          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 }}"
+          ref: "${{ steps.version_extraction.outputs.version_raw }}"
 
-      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-qemu-action@v3.7.0
       - uses: docker/setup-buildx-action@v3.11.1
 
       - uses: docker/login-action@v3.6.0
@@ -71,11 +90,15 @@ jobs:
       - name: Build and push image
         run: |
           docker buildx build \
-            --platform linux/amd64 \
+            --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 \
             --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:
@@ -87,10 +110,14 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
+          VERSION="${{ inputs.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+
+          echo "Version (raw):      ${VERSION}"
+          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:
@@ -100,11 +127,11 @@ jobs:
 
       - name: Create and push manifest
         run: |
-          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 }}-amd64 \
-            --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64
+          docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \
+            --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_cleaned }}-arm64
 
-          docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}
+          docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}
 
   sync-to-hub-docker-io:
     needs:
@@ -114,15 +141,17 @@ jobs:
       - id: version_extraction
         name: Extract git tag
         run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
+          VERSION="${{ inputs.tag || github.ref_name }}"
           VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+
+          echo "Version (raw):      ${VERSION}"
+          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 \
@@ -131,5 +160,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 }} \
-              docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version }}
+              docker://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \
+              docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}

Dockerfile

@@ -1,6 +1,9 @@
-FROM docker.io/library/golang:1.25.3-alpine3.21 AS build
+FROM docker.io/library/golang:1.25.4-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.2 # renovate: datasource=github-releases depName=docker/compose
+DC_VERSION?=v2.40.3 # 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,12 +17,20 @@ 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.34.0
+IMAGE_VERSION=2.40.3
 docker run \
   --rm \
-  --volume ./path/to/docker-compose.yml:/workdir/docker-compose.yml:ro \
+  --volume "$(pwd):$(pwd)" \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  --workdir /workdir \
-    git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION} \
-      ps
+  --workdir "$(pwd)" \
+    "git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION}" \
+      version
 ```

renovate.json

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