fix: prepare upgrade to docker-compose v5
All checks were successful
Build / build-amd64 (push) Successful in 32s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 1m25s

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 dc9f1b5504
6 changed files with 24 additions and 55 deletions

View File

@@ -4,7 +4,7 @@ on:
push:
branches: [ "master" ]
paths:
- Makefile
- Dockerfile
env:
GIT_EMAIL: noreply@cryptic.systems
@@ -26,8 +26,8 @@ jobs:
run: |
echo "changed=false" >> $GITHUB_OUTPUT
for file in Makefile; do
if git diff HEAD~1 HEAD -- "${file}" | grep --quiet '^[+-]DC_VERSION'; then
for file in Dockerfile; do
if git diff HEAD~1 HEAD -- "${file}" | grep --quiet '^[+-]ARG DC_VERSION'; then
echo "DC_VERSION line changed."
echo "changed=true" >> $GITHUB_OUTPUT
break
@@ -42,7 +42,7 @@ jobs:
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)"
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}"

View File

@@ -1,10 +1,5 @@
name: Build
env:
GONOSUMDB: ${{ vars.GONOSUMDB }}
GOPRIVATE: ${{ vars.GOPRIVATE }}
GOPROXY: ${{ vars.GOPROXY }}
on:
pull_request:
types:
@@ -29,9 +24,6 @@ jobs:
TAG=latest
docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/arm64 \
--file Dockerfile \
--provenance false \
@@ -50,9 +42,6 @@ jobs:
TAG=latest
docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/amd64 \
--file Dockerfile \
--provenance false \

View File

@@ -1,8 +1,5 @@
name: Release
env:
GOPROXY: ${{ vars.GOPROXY }}
on:
push:
tags:
@@ -48,9 +45,6 @@ jobs:
run: |
docker buildx build \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \
--platform linux/arm64 \
--provenance false \
@@ -91,9 +85,6 @@ jobs:
run: |
docker buildx build \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \
--platform linux/amd64 \
--provenance false \

View File

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

View File

@@ -1,21 +1,24 @@
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 GONOSUMDB
ARG GOPRIVATE
ARG GOPROXY
# renovate: datasource=github-releases depName=docker/compose
ARG DC_VERSION=v2.40.3
RUN set -ex && \
apk update && \
apk upgrade && \
apk add git make
RUN NAME=docker-compose-$(uname | tr [:upper:] [:lower:])-$(uname -m); \
apt update --yes && \
apt install --yes curl && \
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 && \
cd docker-compose && \
make DESTDIR=/cache
FROM docker.io/library/alpine:3.23
COPY --from=build /cache/docker-compose /usr/bin/docker-compose
FROM scratch
COPY --from=download /tmp/docker-compose /usr/bin/docker-compose
ENTRYPOINT [ "/usr/bin/docker-compose" ]

View File

@@ -1,7 +1,3 @@
# DC_VERSION
# Only required to install a specify version
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
# 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 \