Compare commits

..

1 Commits

Author SHA1 Message Date
487fafb56d chore(deps): update dependency docker/compose to v2.40.2
All checks were successful
Build / build-amd64 (pull_request) Successful in 2m32s
Lint Markdown files / markdown-lint (pull_request) Successful in 5s
Build / build-arm64 (pull_request) Successful in 6m59s
2025-10-24 13:05:34 +00:00
7 changed files with 51 additions and 87 deletions

View File

@@ -39,7 +39,6 @@ jobs:
run: echo "No DC_VERSION change. Exiting..." run: echo "No DC_VERSION change. Exiting..."
- name: Create and push new tag - name: Create and push new tag
id: create_tag
if: steps.check_change.outputs.changed == 'true' if: steps.check_change.outputs.changed == 'true'
run: | 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 'DC_VERSION\?=v?[\d]*(\.[\d]*){0,2}' Makefile | cut --delimiter='=' --fields=2)"
@@ -54,19 +53,12 @@ jobs:
- name: Trigger "Push tagged images" workflow - name: Trigger "Push tagged images" workflow
if: steps.check_change.outputs.changed == 'true' if: steps.check_change.outputs.changed == 'true'
uses: actions/github-script@v8.0.0 uses: peter-evans/repository-dispatch@v4.0.0
with: with:
script: | client-payload: |
const workflowFileName = 'release.yaml'; {
const defaultBranch = context.payload.repository.default_branch; "tag": "${{ steps.bump.outputs.defined_tag }}"
const definedTag = '${{ steps.create_tag.outputs.defined_tag }}'; }
event-type: push-tagged-images
await github.rest.actions.createWorkflowDispatch({ repository: ${{ github.repository }}
owner: context.repo.owner, token: ${{ github.token }}
repo: context.repo.repo,
workflow_id: workflowFileName,
ref: defaultBranch,
inputs: {
tag: definedTag
}
});

View File

@@ -1,16 +1,11 @@
name: Build name: Build
env:
GONOSUMDB: ${{ vars.GONOSUMDB }}
GOPRIVATE: ${{ vars.GOPRIVATE }}
GOPROXY: ${{ vars.GOPROXY }}
on: on:
pull_request: pull_request:
types: types:
- opened - "opened"
- reopened - "reopened"
- synchronize - "synchronize"
push: push:
branches: branches:
- master - master
@@ -21,7 +16,7 @@ jobs:
runs-on: ubuntu-latest-arm64 runs-on: ubuntu-latest-arm64
steps: steps:
- uses: actions/checkout@v5.0.0 - uses: actions/checkout@v5.0.0
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.6.0
- uses: docker/setup-buildx-action@v3.11.1 - uses: docker/setup-buildx-action@v3.11.1
- name: Build image - name: Build image
@@ -42,7 +37,7 @@ jobs:
runs-on: ubuntu-latest-amd64 runs-on: ubuntu-latest-amd64
steps: steps:
- uses: actions/checkout@v5.0.0 - uses: actions/checkout@v5.0.0
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.6.0
- uses: docker/setup-buildx-action@v3.11.1 - uses: docker/setup-buildx-action@v3.11.1
- name: Build image - name: Build image

View File

@@ -16,6 +16,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v5.0.0 - uses: actions/checkout@v5.0.0
- uses: DavidAnson/markdownlint-cli2-action@v20.0.0 - uses: DavidAnson/markdownlint-cli2-action@v19.1.0
with: with:
globs: '**/*.md' globs: '**/*.md'

View File

@@ -1,18 +1,11 @@
name: Release name: Release
env:
GOPROXY: ${{ vars.GOPROXY }}
on: on:
push: push:
tags: tags:
- "**" - "**"
workflow_dispatch: repository_dispatch:
inputs: types: [ push-tagged-images ]
tag:
description: "Tag which should be released"
type: string
required: true
jobs: jobs:
push-arm64: push-arm64:
@@ -21,21 +14,17 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}"
echo "Version (raw): ${VERSION}" echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "Version (cleaned): ${VERSION/v/}"
echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
- uses: actions/checkout@v5.0.0 - uses: actions/checkout@v5.0.0
with: with:
fetch-tags: true fetch-tags: true
ref: "${{ steps.version_extraction.outputs.version_raw }}" ref: "${{ steps.version_extraction.outputs.version }}"
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.6.0
- uses: docker/setup-buildx-action@v3.11.1 - uses: docker/setup-buildx-action@v3.11.1
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.6.0
@@ -47,15 +36,14 @@ jobs:
- name: Build and push image - name: Build and push image
run: | run: |
docker buildx build \ docker buildx build \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--build-arg GONOSUMDB=${GONOSUMDB} \ --build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \ --build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \ --build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \
--platform linux/arm64 \ --platform linux/arm64 \
--file Dockerfile \
--provenance false \ --provenance false \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64 \
--push \ --push \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64 \
. .
push-amd64: push-amd64:
@@ -64,21 +52,17 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}"
echo "Version (raw): ${VERSION}" echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "Version (cleaned): ${VERSION/v/}"
echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
- uses: actions/checkout@v5.0.0 - uses: actions/checkout@v5.0.0
with: with:
fetch-tags: true fetch-tags: true
ref: "${{ steps.version_extraction.outputs.version_raw }}" ref: "${{ steps.version_extraction.outputs.version }}"
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.6.0
- uses: docker/setup-buildx-action@v3.11.1 - uses: docker/setup-buildx-action@v3.11.1
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.6.0
@@ -90,15 +74,14 @@ jobs:
- name: Build and push image - name: Build and push image
run: | run: |
docker buildx build \ docker buildx build \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--build-arg GONOSUMDB=${GONOSUMDB} \ --build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \ --build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \ --build-arg GOPROXY=${GOPROXY} \
--file Dockerfile \
--platform linux/amd64 \ --platform linux/amd64 \
--file Dockerfile \
--provenance false \ --provenance false \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-amd64 \
--push \ --push \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \
. .
push-manifest: push-manifest:
@@ -110,14 +93,10 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}"
echo "Version (raw): ${VERSION}" echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "Version (cleaned): ${VERSION/v/}"
echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.6.0
with: with:
@@ -127,11 +106,11 @@ jobs:
- name: Create and push manifest - name: Create and push manifest
run: | run: |
docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \ 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_cleaned }}-amd64 \ --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_cleaned }}-arm64 --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64
docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}
sync-to-hub-docker-io: sync-to-hub-docker-io:
needs: needs:
@@ -141,17 +120,15 @@ jobs:
- id: version_extraction - id: version_extraction
name: Extract git tag name: Extract git tag
run: | run: |
VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${{ github.event.client_payload.tag || github.ref_name }}"
VERSION="${VERSION#refs/*/}" VERSION="${VERSION#refs/*/}"
echo "Version: ${VERSION}"
echo "Version (raw): ${VERSION}" echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "Version (cleaned): ${VERSION/v/}"
echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
- name: Copy images to docker.io - name: Copy images to docker.io
run: | run: |
TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
apt-get update --yes apt-get update --yes
apt-get install --yes skopeo apt-get install --yes skopeo
skopeo copy \ skopeo copy \
@@ -160,5 +137,5 @@ jobs:
--dest-username ${{ secrets.DOCKER_IO_USERNAME }} \ --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \
--src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \ --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
--src-username volker.raschek \ --src-username volker.raschek \
docker://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \ docker://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }} \
docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version }}

View File

@@ -1,4 +1,4 @@
FROM docker.io/library/golang:1.25.4-alpine3.21 AS build FROM docker.io/library/golang:1.25.3-alpine3.21 AS build
ARG DC_VERSION=main ARG DC_VERSION=main
ARG GONOSUMDB ARG GONOSUMDB

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?=v2.40.2 # 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

View File

@@ -11,12 +11,12 @@ The workflow or how `docker-compose` can in general be used is documented at
image. image.
```bash ```bash
IMAGE_VERSION=2.40.3 IMAGE_VERSION=2.40.2
docker run \ docker run \
--rm \ --rm \
--volume "$(pwd):$(pwd)" \ --volume ./path/to/docker-compose.yml:/workdir/docker-compose.yml:ro \
--volume /var/run/docker.sock:/var/run/docker.sock \ --volume /var/run/docker.sock:/var/run/docker.sock \
--workdir "$(pwd)" \ --workdir /workdir \
"git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION}" \ git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION} \
version ps
``` ```