chore(deps): update dependency docker/compose to v5.1.4

This reverts commit fa51e930e0.

.gitea/workflows/auto-release.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "master" ]
     paths:
-    - Makefile
+    - Dockerfile
 
 env:
   GIT_EMAIL: noreply@cryptic.systems
@@ -13,10 +13,12 @@ env:
 jobs:
   tag_on_change:
     permissions:
+      actions: write
       contents: write
+
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
@@ -25,8 +27,8 @@ jobs:
         run: |
           echo "changed=false" >> $GITHUB_OUTPUT
 
-          for file in Makefile; do
+          for file in Dockerfile; do
-            if git diff HEAD~1 HEAD -- "${file}" | grep --quiet '^[+-]DC_VERSION'; then
+            if git diff HEAD~1 HEAD -- "${file}" | grep --quiet '^[+-]ARG DC_VERSION'; then
               echo "DC_VERSION line changed."
               echo "changed=true" >> $GITHUB_OUTPUT
               break
@@ -37,44 +39,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 }}
+          defined_tag="$(grep --only-matching --perl-regexp 'ARG DC_VERSION=v?[\d]*(\.[\d]*){0,2}' Dockerfile | 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 tag -a "${defined_tag}" -m "${defined_tag}"
-          git push origin "${new_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@v9.0.0
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
-          event-type: push-tagged-images
+            const workflowFileName = 'release.yaml';
-          client-payload: |
+            const defaultBranch = context.payload.repository.default_branch;
-            {
+            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

@@ -3,9 +3,9 @@ name: Build
 on:
   pull_request:
     types:
-    - "opened"
+    - opened
-    - "reopened"
+    - reopened
-    - "synchronize"
+    - synchronize
   push:
     branches:
     - master
@@ -15,9 +15,9 @@ jobs:
   build-arm64:
     runs-on: ubuntu-latest-arm64
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.2
-      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-qemu-action@v4.1.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v4.1.0
 
       - name: Build image
         run: |
@@ -33,9 +33,9 @@ jobs:
   build-amd64:
     runs-on: ubuntu-latest-amd64
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v6.0.2
-      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-qemu-action@v4.1.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v4.1.0
 
       - name: Build image
         run: |

.gitea/workflows/markdown-linters.yaml

@@ -15,7 +15,7 @@ jobs:
   markdown-lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5.0.0
+    - uses: actions/checkout@v6.0.2
-    - uses: DavidAnson/markdownlint-cli2-action@v19.1.0
+    - uses: DavidAnson/markdownlint-cli2-action@v21.0.0
       with:
         globs: '**/*.md'

.gitea/workflows/release.yaml

@@ -4,8 +4,12 @@ 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,20 +18,24 @@ 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
 
-      - uses: actions/checkout@v5.0.0
+          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@v6.0.2
         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@v4.1.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v4.1.0
 
-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@v4.2.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -36,11 +44,12 @@ jobs:
       - name: Build and push image
         run: |
           docker buildx build \
-            --platform linux/arm64 \
+            --build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
             --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,20 +58,24 @@ 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
 
-      - uses: actions/checkout@v5.0.0
+          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@v6.0.2
         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@v4.1.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v4.1.0
 
-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@v4.2.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -71,11 +84,12 @@ jobs:
       - name: Build and push image
         run: |
           docker buildx build \
-            --platform linux/amd64 \
+            --build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
             --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,12 +101,16 @@ 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
 
-      - uses: docker/login-action@v3.6.0
+          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@v4.2.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -100,11 +118,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:
@@ -114,15 +132,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 +151,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 }}

.gitea/workflows/update-docker-hub-description.yaml

@@ -10,10 +10,9 @@ on:
 
 jobs:
   update-description-on-hub-docker-io:
-    runs-on:
+    runs-on: ubuntu-latest
-    - ubuntu-latest
     steps:
-    - uses: actions/checkout@v5.0.0
+    - uses: actions/checkout@v6.0.2
     - uses: peter-evans/dockerhub-description@v5.0.0
       with:
         username: ${{ secrets.DOCKER_IO_USERNAME }}

Dockerfile

@@ -1,21 +1,26 @@
-FROM docker.io/library/golang:1.25.3-alpine3.21 AS build
+FROM docker.io/library/ubuntu:26.04 AS download
 
-ARG DC_VERSION=main
+ARG DC_VERSION=v5.1.4
-ARG GONOSUMDB
-ARG GOPRIVATE
-ARG GOPROXY
 
-RUN set -ex && \
+RUN NAME=docker-compose-$(uname | tr [:upper:] [:lower:])-$(uname -m); \
-    apk update && \
+    apt update --yes && \
-    apk upgrade && \
+    apt install --yes curl && \
-    apk add git make
+    curl \
+      --fail \
+      --output "/tmp/${NAME}" \
+      --location "https://github.com/docker/compose/releases/download/${DC_VERSION}/${NAME}" && \
+    curl \
+      --fail \
+      --output /tmp/checksums.txt \
+      --location "https://github.com/docker/compose/releases/download/${DC_VERSION}/checksums.txt" && \
+    (cd /tmp && sha256sum --ignore-missing --check checksums.txt) && \
+    ln -s "${NAME}" /tmp/docker-compose && \
+    chmod +x /tmp/docker-compose
 
-RUN git clone https://github.com/docker/compose.git --branch ${DC_VERSION} docker-compose && \
+FROM scratch
-    cd docker-compose && \
-    make DESTDIR=/cache
 
-FROM docker.io/library/alpine:3.22
+LABEL org.opencontainers.image.description="Define and run multi-container applications with Docker" \
-
+      io.artifacthub.package.readme-url="https://github.com/docker/compose"
-COPY --from=build /cache/docker-compose /usr/bin/docker-compose
 
+COPY --from=download /tmp/docker-compose /usr/bin/docker-compose
 ENTRYPOINT [ "/usr/bin/docker-compose" ]

Makefile

@@ -1,7 +1,3 @@
-# DC_VERSION
-# Only required to install a specify version
-DC_VERSION?=v2.40.0 # 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
 # run a container image.
@@ -17,20 +13,11 @@ 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=5.1.4
 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 \
+  --workdir "$(pwd)" \
-    git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION} \
+    "git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION}" \
-      ps
+      version
 ```

renovate.json

@@ -4,9 +4,11 @@
     {
       "customType": "regex",
       "fileMatch": [
+        "^Dockerfile$",
         "^README\\.md$"
       ],
       "matchStrings": [
+        "ARG DC_VERSION=(?<currentValue>.*)",
         "IMAGE_VERSION=(?<currentValue>.*)"
       ],
       "datasourceTemplate": "github-releases",
@@ -31,6 +33,10 @@
       ],
       "matchManagers": [
         "regex"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
       ]
     }
   ]