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

This reverts commit 7edacb5a6c.

.gitea/workflows/auto-release.yaml

@@ -39,6 +39,7 @@ jobs:
         run: echo "No DC_VERSION change. Exiting..."
 
       - name: Create and push new tag
+        id: create_tag
         if: steps.check_change.outputs.changed == 'true'
         run: |
           defined_tag="$(grep --only-matching --perl-regexp 'DC_VERSION\?=v?[\d]*(\.[\d]*){0,2}' Makefile | cut --delimiter='=' --fields=2)"
@@ -52,6 +53,7 @@ jobs:
           git push origin "${defined_tag}"
 
       - name: Trigger "Push tagged images" workflow
+        if: steps.check_change.outputs.changed == 'true'
         uses: actions/github-script@v8.0.0
         with:
           script: |
@@ -65,6 +67,6 @@ jobs:
                 workflow_id: workflowFileName,
                 ref: defaultBranch,
                 inputs: {
-                  tag: "definedTag"
+                  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
@@ -37,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

.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,5 +1,8 @@
 name: Release
 
+env:
+  GOPROXY: ${{ vars.GOPROXY }}
+
 on:
   push:
     tags:
@@ -20,15 +23,19 @@ jobs:
         run: |
           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
@@ -40,14 +47,15 @@ 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} \
-            --platform linux/arm64 \
             --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:
@@ -58,15 +66,19 @@ jobs:
         run: |
           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
@@ -78,14 +90,15 @@ 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} \
-            --platform linux/amd64 \
             --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:
@@ -99,8 +112,12 @@ jobs:
         run: |
           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:
@@ -110,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:
@@ -126,13 +143,15 @@ jobs:
         run: |
           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 \
@@ -141,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,4 +1,4 @@
-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

Makefile

@@ -1,6 +1,6 @@
 # DC_VERSION
 # Only required to install a specify version
-DC_VERSION?=v2.40.0 # 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

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
 ```