fix(ci): add build args containing GO environment variables

.gitea/workflows/auto-release.yaml

@@ -0,0 +1,80 @@
+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: 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
+        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_USER}"
+          git config --local user.email "${GIT_EMAIL}"
+          git tag -a "${new_tag}" -m "${new_tag}"
+          git push origin "${new_tag}"
+
+      - name: Trigger "Push tagged images" workflow
+        if: steps.check_change.outputs.changed == 'true'
+        uses: peter-evans/repository-dispatch@v4.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          event-type: push-tagged-images
+          client-payload: |
+            {
+              "tag": "${{ steps.bump.outputs.new_tag }}"
+            }

.gitea/workflows/build.yaml

@@ -15,9 +15,9 @@ jobs:
   build-arm64:
     runs-on: ubuntu-latest-arm64
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
       - uses: docker/setup-qemu-action@v3.6.0
-      - uses: docker/setup-buildx-action@v3.10.0
+      - uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build image
         run: |
@@ -33,9 +33,9 @@ jobs:
   build-amd64:
     runs-on: ubuntu-latest-amd64
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
       - uses: docker/setup-qemu-action@v3.6.0
-      - uses: docker/setup-buildx-action@v3.10.0
+      - uses: docker/setup-buildx-action@v3.11.1
 
       - name: Build image
         run: |

.gitea/workflows/markdown-linters.yaml

@@ -0,0 +1,21 @@
+name: 'Lint Markdown files'
+
+on:
+  pull_request:
+    types:
+    - opened
+    - reopened
+    - synchronize
+  push:
+    branches:
+    - master
+  workflow_dispatch: {}
+
+jobs:
+  markdown-lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5.0.0
+    - uses: DavidAnson/markdownlint-cli2-action@v19.1.0
+      with:
+        globs: '**/*.md'

.gitea/workflows/release.yaml

@@ -4,16 +4,30 @@ on:
   push:
     tags:
     - "**"
+  repository_dispatch:
+    types: [ push-tagged-images ]
 
 jobs:
   push-arm64:
     runs-on: ubuntu-latest-arm64
     steps:
-      - uses: actions/checkout@v4.2.2
+      - id: version_extraction
-      - uses: docker/setup-qemu-action@v3.6.0
+        name: Extract git tag
-      - uses: docker/setup-buildx-action@v3.10.0
+        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.4.0
+      - uses: actions/checkout@v5.0.0
+        with:
+          fetch-tags: true
+          ref: "${{ steps.version_extraction.outputs.version }}"
+
+      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-buildx-action@v3.11.1
+
+      - uses: docker/login-action@v3.6.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -21,24 +35,34 @@ jobs:
 
       - name: Build and push image
         run: |
-          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
-
           docker buildx build \
             --platform linux/arm64 \
             --file Dockerfile \
             --provenance false \
-            --tag git.cryptic.systems/volker.raschek/docker-compose:${TAG}-arm64 \
+            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64 \
             --push \
             .
 
   push-amd64:
     runs-on: ubuntu-latest-amd64
     steps:
-      - uses: actions/checkout@v4.2.2
+      - id: version_extraction
-      - uses: docker/setup-qemu-action@v3.6.0
+        name: Extract git tag
-      - uses: docker/setup-buildx-action@v3.10.0
+        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.4.0
+      - uses: actions/checkout@v5.0.0
+        with:
+          fetch-tags: true
+          ref: "${{ steps.version_extraction.outputs.version }}"
+
+      - uses: docker/setup-qemu-action@v3.6.0
+      - uses: docker/setup-buildx-action@v3.11.1
+
+      - uses: docker/login-action@v3.6.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -46,13 +70,11 @@ jobs:
 
       - name: Build and push image
         run: |
-          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
-
           docker buildx build \
             --platform linux/amd64 \
             --file Dockerfile \
             --provenance false \
-            --tag git.cryptic.systems/volker.raschek/docker-compose:${TAG}-amd64 \
+            --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-amd64 \
             --push \
             .
 
@@ -62,7 +84,15 @@ jobs:
     - push-arm64
     - push-amd64
     steps:
-      - uses: docker/login-action@v3.4.0
+      - 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
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -70,30 +100,36 @@ jobs:
 
       - name: Create and push manifest
         run: |
-          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
+          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:${TAG} \
+          docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}
-            --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:
-    - name: Copy images to docker.io
+      - id: version_extraction
-      run: |
+        name: Extract git tag
-        TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
+        run: |
+          VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
+          VERSION="${VERSION#refs/*/}"
+          echo "Version: ${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
-        apt-get update --yes
+      - name: Copy images to docker.io
-        apt-get install --yes skopeo
+        run: |
-        skopeo copy \
+          TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
-          --all \
+
-          --dest-password ${{ secrets.DOCKER_IO_PASSWORD }} \
+          apt-get update --yes
-          --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \
+          apt-get install --yes skopeo
-          --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
+          skopeo copy \
-          --src-username volker.raschek \
+            --all \
-            docker://git.cryptic.systems/volker.raschek/docker-compose:${TAG} \
+            --dest-password ${{ secrets.DOCKER_IO_PASSWORD }} \
-            docker://docker.io/volkerraschek/docker-compose:${TAG}
+            --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 }}

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

@@ -6,14 +6,15 @@ on:
     - master
     paths:
     - README.md
+  workflow_dispatch: {}
 
 jobs:
   update-description-on-hub-docker-io:
     runs-on:
     - ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v5.0.0
-    - uses: peter-evans/dockerhub-description@v4.0.2
+    - uses: peter-evans/dockerhub-description@v5.0.0
       with:
         username: ${{ secrets.DOCKER_IO_USERNAME }}
         password: ${{ secrets.DOCKER_IO_PASSWORD }}

Dockerfile

@@ -1,6 +1,9 @@
-FROM docker.io/library/golang:1.24.3-alpine3.21 AS build
+FROM docker.io/library/golang:1.25.3-alpine3.21 AS build
 
 ARG DC_VERSION=main
+ARG GONOSUMDB
+ARG GOPRIVATE
+ARG GOPROXY
 
 RUN set -ex && \
     apk update && \
@@ -11,7 +14,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.21
+FROM docker.io/library/alpine:3.22
 
 COPY --from=build /cache/docker-compose /usr/bin/docker-compose
 

Makefile

@@ -1,6 +1,6 @@
 # DC_VERSION
 # Only required to install a specify version
-DC_VERSION?=v2.36.2 # renovate: datasource=github-releases depName=docker/compose
+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
@@ -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 \
@@ -46,4 +54,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}

README.md

@@ -6,8 +6,9 @@ This project contains all sources to build the container image `git.cryptic.syst
 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 [here](https://docs.docker.com/compose/).
+The workflow or how `docker-compose` can in general be used is documented at
-Nevertheless, here are some examples of how to use the container image.
+[docs.docker.com](https://docs.docker.com/compose/). Nevertheless, here are some examples of how to use the container
+image.
 
 ```bash
 IMAGE_VERSION=2.34.0

renovate.json

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