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

2025-05-06 22:04:01 +00:00
10 changed files with 104 additions and 205 deletions
--- a/.gitea/workflows/auto-release.yaml
+++ b/.gitea/workflows/auto-release.yaml
@@ -1,63 +0,0 @@
-name: Auto release
-
-on:
-  push:
-    branches: [ "master" ]
-    paths:
-    - Makefile
-
-env:
-  GIT_EMAIL: noreply@cryptic.systems
-  GIT_USER: CSRBot
-
-jobs:
-  tag_on_change:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5.0.0
-        with:
-          fetch-depth: 0
-
-      - name: Check if DC_VERSION line changed
-        id: check_change
-        run: |
-          echo "changed=false" >> $GITHUB_OUTPUT
-
-          for file in Makefile; do
-            if git diff HEAD~1 HEAD -- "${file}" | grep --quiet '^[+-]DC_VERSION'; then
-              echo "DC_VERSION line changed."
-              echo "changed=true" >> $GITHUB_OUTPUT
-              break
-            fi
-          done
-
-      - name: Stop if no change detected
-        if: steps.check_change.outputs.changed == 'false'
-        run: echo "No DC_VERSION change. Exiting..."
-
-      - name: Create and push new 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)"
-
-          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 "${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
-        with:
-          client-payload: |
-            {
-              "tag": "${{ steps.bump.outputs.defined_tag }}"
-            }
-          event-type: push-tagged-images
-          repository: ${{ github.repository }}
-          token: ${{ github.token }}
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -15,18 +15,15 @@ jobs:
  build-arm64:
    runs-on: ubuntu-latest-arm64
    steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v4.2.2
      - uses: docker/setup-qemu-action@v3.6.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v3.10.0

      - name: Build image
        run: |
          TAG=latest

          docker buildx build \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
            --platform linux/arm64 \
            --file Dockerfile \
            --provenance false \
@@ -36,18 +33,15 @@ jobs:
  build-amd64:
    runs-on: ubuntu-latest-amd64
    steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v4.2.2
      - uses: docker/setup-qemu-action@v3.6.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v3.10.0

      - name: Build image
        run: |
          TAG=latest

          docker buildx build \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
            --platform linux/amd64 \
            --file Dockerfile \
            --provenance false \
--- a/.gitea/workflows/markdown-linters.yaml
+++ b/.gitea/workflows/markdown-linters.yaml
@@ -1,21 +1,46 @@
-name: 'Lint Markdown files'
+name: Markdown linter

 on:
  pull_request:
-    types:
-    - opened
-    - reopened
-    - synchronize
+    paths: [ "**/*.md" ]
+    types: [ "opened", "reopened", "synchronize" ]
  push:
    branches:
-    - master
+    - '**'
+    paths: [ "**/*.md" ]
+    tags-ignore:
+    - '**'
  workflow_dispatch: {}

 jobs:
-  markdown-lint:
-    runs-on: ubuntu-latest
+  markdown-link-checker:
+    container:
+      image: docker.io/library/node:23.11.0-alpine
+    runs-on:
+    - ubuntu-latest
    steps:
-    - uses: actions/checkout@v5.0.0
-    - uses: DavidAnson/markdownlint-cli2-action@v19.1.0
-      with:
-        globs: '**/*.md'
+    - name: Install tooling
+      run: |
+        apk update
+        apk add git npm
+    - uses: actions/checkout@v4.2.2
+    - name: Verify links in markdown files
+      run: |
+        npm install
+        npm run readme:link
+
+  markdown-lint:
+    container:
+      image: docker.io/library/node:23.11.0-alpine
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - name: Install tooling
+      run: |
+        apk update
+        apk add git
+    - uses: actions/checkout@v4.2.2
+    - name: Lint markdown files
+      run: |
+        npm install
+        npm run readme:lint
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -4,30 +4,16 @@ on:
  push:
    tags:
    - "**"
-  repository_dispatch:
-    types: [ push-tagged-images ]

 jobs:
  push-arm64:
    runs-on: ubuntu-latest-arm64
    steps:
-      - id: version_extraction
-        name: Extract git tag
-        run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
-          VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-
-      - uses: actions/checkout@v5.0.0
-        with:
-          fetch-tags: true
-          ref: "${{ steps.version_extraction.outputs.version }}"
-
+      - uses: actions/checkout@v4.2.2
      - uses: docker/setup-qemu-action@v3.6.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v3.10.0

-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@v3.4.0
        with:
          registry: git.cryptic.systems
          username: ${{ github.repository_owner }}
@@ -35,37 +21,24 @@ jobs:

      - name: Build and push image
        run: |
+          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
+
          docker buildx build \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
            --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:${TAG}-arm64 \
            --push \
            .

  push-amd64:
    runs-on: ubuntu-latest-amd64
    steps:
-      - id: version_extraction
-        name: Extract git tag
-        run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
-          VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-
-      - uses: actions/checkout@v5.0.0
-        with:
-          fetch-tags: true
-          ref: "${{ steps.version_extraction.outputs.version }}"
-
+      - uses: actions/checkout@v4.2.2
      - uses: docker/setup-qemu-action@v3.6.0
-      - uses: docker/setup-buildx-action@v3.11.1
+      - uses: docker/setup-buildx-action@v3.10.0

-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@v3.4.0
        with:
          registry: git.cryptic.systems
          username: ${{ github.repository_owner }}
@@ -73,14 +46,13 @@ jobs:

      - name: Build and push image
        run: |
+          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
+
          docker buildx build \
-            --build-arg GONOSUMDB=${GONOSUMDB} \
-            --build-arg GOPRIVATE=${GOPRIVATE} \
-            --build-arg GOPROXY=${GOPROXY} \
            --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:${TAG}-amd64 \
            --push \
            .

@@ -90,15 +62,7 @@ jobs:
    - push-arm64
    - push-amd64
    steps:
-      - id: version_extraction
-        name: Extract git tag
-        run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
-          VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-
-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@v3.4.0
        with:
          registry: git.cryptic.systems
          username: ${{ github.repository_owner }}
@@ -106,36 +70,30 @@ 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
+          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')

-          docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}
+          docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${TAG} \
+            --amend git.cryptic.systems/volker.raschek/docker-compose:${TAG}-amd64 \
+            --amend git.cryptic.systems/volker.raschek/docker-compose:${TAG}-arm64
+
+          docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${TAG}

  sync-to-hub-docker-io:
    needs:
    - push-manifest
    runs-on: ubuntu-latest
    steps:
-      - id: version_extraction
-        name: Extract git tag
-        run: |
-          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
-          VERSION="${VERSION#refs/*/}"
-          echo "Version: ${VERSION}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+    - name: Copy images to docker.io
+      run: |
+        TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')

-      - 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 \
-            --all \
-            --dest-password ${{ secrets.DOCKER_IO_PASSWORD }} \
-            --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 }}
+        apt-get update --yes
+        apt-get install --yes skopeo
+        skopeo copy \
+          --all \
+          --dest-password ${{ secrets.DOCKER_IO_PASSWORD }} \
+          --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:${TAG} \
+            docker://docker.io/volkerraschek/docker-compose:${TAG}
--- a/.gitea/workflows/update-docker-hub-description.yaml
+++ b/.gitea/workflows/update-docker-hub-description.yaml
@@ -6,15 +6,14 @@ on:
    - master
    paths:
    - README.md
-  workflow_dispatch: {}

 jobs:
  update-description-on-hub-docker-io:
    runs-on:
    - ubuntu-latest
    steps:
-    - uses: actions/checkout@v5.0.0
-    - uses: peter-evans/dockerhub-description@v5.0.0
+    - uses: actions/checkout@v4.2.2
+    - uses: peter-evans/dockerhub-description@v4.0.2
      with:
        username: ${{ secrets.DOCKER_IO_USERNAME }}
        password: ${{ secrets.DOCKER_IO_PASSWORD }}
--- a/.markdownlint.yaml
+++ b/.markdownlint.yaml
@@ -56,6 +56,8 @@ MD013:
  tables: false
  # Include headings
  headings: true
+  # Include headings
+  headers: true
  # Strict length checking
  strict: false
  # Stern length checking
@@ -68,6 +70,11 @@ MD022:
  # Blank lines below heading
  lines_below: 1

+# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
+MD024:
+  # Only check sibling headings
+  allow_different_nesting: true
+
 # MD025/single-title/single-h1 - Multiple top-level headings in the same document
 MD025:
  # Heading level
--- a/7
+++ b/7
@@ -1,9 +1,6 @@
-FROM docker.io/library/golang:1.25.3-alpine3.21 AS build
+FROM docker.io/library/golang:1.24.2-alpine3.21 AS build

 ARG DC_VERSION=main
-ARG GONOSUMDB
-ARG GOPRIVATE
-ARG GOPROXY

 RUN set -ex && \
    apk update && \
@@ -14,7 +11,7 @@ RUN git clone https://github.com/docker/compose.git --branch ${DC_VERSION} docke
    cd docker-compose && \
    make DESTDIR=/cache

-FROM docker.io/library/alpine:3.22
+FROM docker.io/library/alpine:3.21

 COPY --from=build /cache/docker-compose /usr/bin/docker-compose

--- a/15
+++ b/15
@@ -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
+# Only required to install a specifiy version
+DC_VERSION?=v2.35.1 # 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 \
@@ -42,6 +34,7 @@ container-image/build:
 PHONY:=container-image/delete
 container-image/delete:
 	- ${CONTAINER_RUNTIME} image rm ${DC_IMAGE_FULLY_QUALIFIED}
+	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}

 # PUSH CONTAINER IMAGE
 # =====================================================================================================================
@@ -54,4 +47,4 @@ container-image/push:
 # =====================================================================================================================
 # Declare the contents of the PHONY variable as phony. We keep that information in a variable so we can use it in
 # if_changed.
-.PHONY: ${PHONY}
+.PHONY: ${PHONY}
--- a/README.md
+++ b/README.md
@@ -1,17 +1,16 @@
-# docker-compose
+# docker-compose-docker

 [![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/docker-compose)](https://hub.docker.com/r/volkerraschek/docker-compose)

-This project contains all sources to build the container image `git.cryptic.systems/volker.raschek/docker-compose`. The
-primary goal of this project is to package the binary `docker-compose` as container image. The source code of the binary
-can be found in the upstream project of [docker/compose](https://github.com/docker/compose).
+This project contains all sources to build the container image `docker.io/volkerraschek/docker-compose`. The primary
+goal of this project is to package the binary `docker-compose` as container image. The source code of the binary can be
+found in the upstream project of [docker/compose](https://github.com/docker/compose).

-The workflow or how `docker-compose` can in general be used is documented at
-[docs.docker.com](https://docs.docker.com/compose/). Nevertheless, here are some examples of how to use the container
-image.
+The workflow or how `docker-compose` can in general be used is documented [here](https://docs.docker.com/compose/).
+Nevertheless, here are some examples of how to use the container image.

 ```bash
-IMAGE_VERSION=2.40.2
+IMAGE_VERSION=2.34.0
 docker run \
  --rm \
  --volume ./path/to/docker-compose.yml:/workdir/docker-compose.yml:ro \
--- a/renovate.json
+++ b/renovate.json
@@ -2,16 +2,13 @@
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "customManagers": [
    {
-      "customType": "regex",
-      "fileMatch": [
-        "^README\\.md$"
-      ],
+      "fileMatch": ["^README\\.md$"],
      "matchStrings": [
-        "IMAGE_VERSION=(?<currentValue>.*)"
+        "VERSION=(?<currentValue>.*)"
      ],
-      "datasourceTemplate": "github-releases",
-      "depNameTemplate": "docker/compose",
-      "versioningTemplate": "semver"
+      "depNameTemplate": "volker.raschek/docker-compose",
+      "datasourceTemplate": "docker",
+      "registryUrlTemplate": "https://git.cryptic.systems"
    }
  ],
  "extends": [
@@ -22,16 +19,9 @@
  ],
  "packageRules": [
    {
-      "addLabels": [
-        "renovate/automerge"
-      ],
-      "automerge": true,
-      "matchPackageNames": [
-        "docker/compose"
-      ],
-      "matchManagers": [
-        "regex"
-      ]
+      "automerge": false,
+      "matchPackageNames": [ "docker-compose" ],
+      "matchManagers": [ "regex" ]
    }
  ]
-}
+}