chore(deps): update dependency docker/compose to v2.40.3

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
@@ -38,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)"
@@ -51,13 +53,19 @@ 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
-        uses: peter-evans/repository-dispatch@v4.0.0
         with:
-          client-payload: |
+          script: |
-            {
+            const workflowFileName = 'release.yaml';
-              "tag": "${{ steps.bump.outputs.defined_tag }}"
+            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
                 }
-          event-type: push-tagged-images
+            });
-          repository: ${{ github.repository }}
-          token: ${{ github.token }}

.gitea/workflows/build.yaml

@@ -1,5 +1,10 @@
 name: Build
 
+env:
+  GONOSUMDB: ${{ vars.GONOSUMDB }}
+  GOPRIVATE: ${{ vars.GOPRIVATE }}
+  GOPROXY: ${{ vars.GOPROXY }}
+
 on:
   pull_request:
     types:

.gitea/workflows/release.yaml

@@ -1,11 +1,18 @@
 name: Release
 
+env:
+  GOPROXY: ${{ vars.GOPROXY }}
+
 on:
   push:
     tags:
     - "**"
-  repository_dispatch:
+  workflow_dispatch:
-    types: [ push-tagged-images ]
+    inputs:
+      tag:
+        description: "Tag which should be released"
+        type: string
+        required: true
 
 jobs:
   push-arm64:
@@ -14,15 +21,19 @@ 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-buildx-action@v3.11.1
@@ -42,7 +53,7 @@ jobs:
             --platform linux/arm64 \
             --file Dockerfile \
             --provenance false \
-            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64 \
+            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64 \
             --push \
             .
 
@@ -52,15 +63,19 @@ 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-buildx-action@v3.11.1
@@ -80,7 +95,7 @@ jobs:
             --platform linux/amd64 \
             --file Dockerfile \
             --provenance false \
-            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-amd64 \
+            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \
             --push \
             .
 
@@ -93,10 +108,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:
@@ -106,11 +125,11 @@ jobs:
 
       - name: Create and push manifest
         run: |
-          docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }} \
+          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 }}-amd64 \
+            --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 }}-arm64
+            --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:
@@ -120,15 +139,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 \
@@ -137,5 +158,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://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \
-              docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version }}
+              docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}

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,7 +11,7 @@ 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 \