Compare commits

..

1 Commits

Author SHA1 Message Date
b5ed7c16b8 chore(deps): update davidanson/markdownlint-cli2-action action to v20
All checks were successful
Build / build-amd64 (pull_request) Successful in 2m22s
Lint Markdown files / markdown-lint (pull_request) Successful in 5s
Build / build-arm64 (pull_request) Successful in 7m0s
2025-10-22 23:04:11 +02:00
6 changed files with 73 additions and 94 deletions

View File

@@ -14,7 +14,6 @@ jobs:
tag_on_change:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5.0.0
@@ -38,35 +37,43 @@ jobs:
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
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)"
echo "defined_tag=${defined_tag}" >> $GITHUB_OUTPUT
echo "New tag: ${defined_tag}"
new_tag=${{ steps.bump.outputs.new_tag }}
git config --local user.name "${GIT_USER}"
git config --local user.email "${GIT_EMAIL}"
git tag -a "${defined_tag}" -m "${defined_tag}"
git push origin "${defined_tag}"
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: actions/github-script@v8.0.0
uses: peter-evans/repository-dispatch@v4.0.0
with:
script: |
const workflowFileName = 'release.yaml';
const defaultBranch = context.payload.repository.default_branch;
const definedTag = '${{ steps.create_tag.outputs.defined_tag }}';
await github.rest.actions.createWorkflowDispatch({
owner: context.repo.owner,
repo: context.repo.repo,
workflow_id: workflowFileName,
ref: defaultBranch,
inputs: {
tag: definedTag
}
});
client-payload: |
{
"tag": "${{ steps.bump.outputs.new_tag }}"
}
event-type: push-tagged-images
repository: ${{ github.repository }}
token: ${{ github.token }}

View File

@@ -1,16 +1,11 @@
name: Build
env:
GONOSUMDB: ${{ vars.GONOSUMDB }}
GOPRIVATE: ${{ vars.GOPRIVATE }}
GOPROXY: ${{ vars.GOPROXY }}
on:
pull_request:
types:
- opened
- reopened
- synchronize
- "opened"
- "reopened"
- "synchronize"
push:
branches:
- master
@@ -21,7 +16,7 @@ jobs:
runs-on: ubuntu-latest-arm64
steps:
- 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
- name: Build image
@@ -42,7 +37,7 @@ jobs:
runs-on: ubuntu-latest-amd64
steps:
- 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
- name: Build image

View File

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

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 GONOSUMDB

View File

@@ -1,6 +1,6 @@
# DC_VERSION
# Only required to install a specify version
DC_VERSION?=v2.40.3 # 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

View File

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