feat(deps): upgrade to docker-compose v5
Some checks failed
Auto release / tag_on_change (push) Successful in 7s
Lint Markdown files / markdown-lint (push) Successful in 9s
Build / build-amd64 (push) Failing after 5s
Build / build-arm64 (push) Failing after 1m40s

The following downloads the finished docker-compose v5 binary and delivers it as
a scratch container image.
This commit is contained in:
2025-12-05 16:04:14 +01:00
parent b520406551
commit b24564d1b6
5 changed files with 20 additions and 57 deletions

View File

@@ -1,10 +1,5 @@
name: Build name: Build
env:
GONOSUMDB: ${{ vars.GONOSUMDB }}
GOPRIVATE: ${{ vars.GOPRIVATE }}
GOPROXY: ${{ vars.GOPROXY }}
on: on:
pull_request: pull_request:
types: types:
@@ -21,17 +16,12 @@ jobs:
runs-on: ubuntu-latest-arm64 runs-on: ubuntu-latest-arm64
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.1
- uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.11.1
- name: Build image - name: Build image
run: | run: |
TAG=latest TAG=latest
docker buildx build \ docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/arm64 \ --platform linux/arm64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \
@@ -42,17 +32,12 @@ jobs:
runs-on: ubuntu-latest-amd64 runs-on: ubuntu-latest-amd64
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.1
- uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.11.1
- name: Build image - name: Build image
run: | run: |
TAG=latest TAG=latest
docker buildx build \ docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/amd64 \ --platform linux/amd64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \

View File

@@ -1,8 +1,5 @@
name: Release name: Release
env:
GOPROXY: ${{ vars.GOPROXY }}
on: on:
push: push:
tags: tags:
@@ -35,9 +32,6 @@ jobs:
fetch-tags: true fetch-tags: true
ref: "${{ steps.version_extraction.outputs.version_raw }}" ref: "${{ steps.version_extraction.outputs.version_raw }}"
- uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.11.1
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.6.0
with: with:
registry: git.cryptic.systems registry: git.cryptic.systems
@@ -48,9 +42,6 @@ jobs:
run: | run: |
docker buildx build \ docker buildx build \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \ --build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \ --file Dockerfile \
--platform linux/arm64 \ --platform linux/arm64 \
--provenance false \ --provenance false \
@@ -78,9 +69,6 @@ jobs:
fetch-tags: true fetch-tags: true
ref: "${{ steps.version_extraction.outputs.version_raw }}" ref: "${{ steps.version_extraction.outputs.version_raw }}"
- uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.11.1
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.6.0
with: with:
registry: git.cryptic.systems registry: git.cryptic.systems
@@ -91,9 +79,6 @@ jobs:
run: | run: |
docker buildx build \ docker buildx build \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \ --build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \ --file Dockerfile \
--platform linux/amd64 \ --platform linux/amd64 \
--provenance false \ --provenance false \

View File

@@ -10,8 +10,7 @@ on:
jobs: jobs:
update-description-on-hub-docker-io: update-description-on-hub-docker-io:
runs-on: runs-on: ubuntu-latest
- ubuntu-latest
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.1
- uses: peter-evans/dockerhub-description@v5.0.0 - uses: peter-evans/dockerhub-description@v5.0.0

View File

@@ -1,21 +1,23 @@
FROM docker.io/library/golang:1.25.5-alpine3.21 AS build FROM docker.io/library/ubuntu:24.04 AS download
ARG DC_VERSION=main ARG DC_VERSION
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.23
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" ] ENTRYPOINT [ "/usr/bin/docker-compose" ]

View File

@@ -1,6 +1,6 @@
# DC_VERSION # DC_VERSION
# Only required to install a specify version # Only required to install a specify version
DC_VERSION?=v2.40.3 # renovate: datasource=github-releases depName=docker/compose DC_VERSION?=v5.0.0 # renovate: datasource=github-releases depName=docker/compose
# CONTAINER_RUNTIME # CONTAINER_RUNTIME
# The CONTAINER_RUNTIME variable will be used to specified the path to a container runtime. This is needed to start and # 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_VERSION?=latest
DC_IMAGE_FULLY_QUALIFIED=${DC_IMAGE_REGISTRY_NAME}/${DC_IMAGE_NAMESPACE}/${DC_IMAGE_NAME}:${DC_IMAGE_VERSION} 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 # BUILD CONTAINER IMAGE
# ===================================================================================================================== # =====================================================================================================================
PHONY:=container-image/build PHONY:=container-image/build
container-image/build: container-image/build:
${CONTAINER_RUNTIME} build \ ${CONTAINER_RUNTIME} build \
--build-arg DC_VERSION=${DC_VERSION} \ --build-arg DC_VERSION=${DC_VERSION} \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \ --file Dockerfile \
--no-cache \ --no-cache \
--pull \ --pull \