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