Compare commits

...

15 Commits

Author SHA1 Message Date
13e459e4a1 chore(deps): update dependency docker/compose to v5
All checks were successful
Build / build-amd64 (pull_request) Successful in 37s
Lint Markdown files / markdown-lint (pull_request) Successful in 4s
Build / build-arm64 (pull_request) Successful in 1m22s
Auto release / tag_on_change (push) Successful in 13s
Build / build-amd64 (push) Successful in 34s
Lint Markdown files / markdown-lint (push) Successful in 4s
Update Docker Hub Description / update-description-on-hub-docker-io (push) Successful in 4s
Build / build-arm64 (push) Successful in 1m19s
2025-12-05 16:56:24 +00:00
e862dccb03 fix(renovate): update configuration
All checks were successful
Auto release / tag_on_change (push) Successful in 5s
Build / build-amd64 (push) Successful in 33s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 1m24s
2025-12-05 17:42:25 +01:00
dc9f1b5504 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.
2025-12-05 17:40:23 +01:00
b520406551 chore(deps): update docker.io/library/alpine docker tag to v3.23
All checks were successful
Build / build-amd64 (pull_request) Successful in 1m38s
Lint Markdown files / markdown-lint (pull_request) Successful in 4s
Build / build-arm64 (pull_request) Successful in 4m32s
Build / build-amd64 (push) Successful in 1m40s
Lint Markdown files / markdown-lint (push) Successful in 5s
Build / build-arm64 (push) Successful in 4m30s
2025-12-03 22:41:58 +00:00
95257314af chore(deps): update actions/checkout action to v6
All checks were successful
Build / build-amd64 (pull_request) Successful in 1m32s
Lint Markdown files / markdown-lint (pull_request) Successful in 5s
Build / build-arm64 (pull_request) Successful in 4m23s
Build / build-amd64 (push) Successful in 1m31s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 4m23s
2025-12-02 21:07:00 +00:00
198e59ef56 chore(deps): update docker.io/library/golang docker tag to v1.25.5
All checks were successful
Build / build-amd64 (pull_request) Successful in 1m35s
Lint Markdown files / markdown-lint (pull_request) Successful in 5s
Build / build-arm64 (pull_request) Successful in 4m28s
Build / build-amd64 (push) Successful in 1m36s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 4m26s
2025-12-02 20:05:39 +00:00
ff4c47dfb2 chore(deps): update davidanson/markdownlint-cli2-action action to v21
All checks were successful
Lint Markdown files / markdown-lint (pull_request) Successful in 8s
Build / build-amd64 (pull_request) Successful in 3m52s
Build / build-arm64 (pull_request) Successful in 5m59s
Build / build-amd64 (push) Successful in 1m36s
Lint Markdown files / markdown-lint (push) Successful in 5s
Build / build-arm64 (push) Successful in 4m33s
2025-11-17 20:06:46 +00:00
21ff2f510b chore(deps): update actions/checkout action to v5.0.1
All checks were successful
Build / build-arm64 (pull_request) Successful in 4m28s
Lint Markdown files / markdown-lint (pull_request) Successful in 10s
Build / build-amd64 (pull_request) Successful in 1m31s
Build / build-arm64 (push) Successful in 4m23s
Lint Markdown files / markdown-lint (push) Successful in 9s
Build / build-amd64 (push) Successful in 1m32s
2025-11-17 17:07:59 +00:00
ae89e1e65d chore(deps): restrict updates of docker/compose to minor and patch
All checks were successful
Build / build-amd64 (push) Successful in 2m50s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 4m59s
2025-11-16 16:50:46 +01:00
3add6b6f5e fix(ci): trigger push tagged images workflow based on condition
All checks were successful
Build / build-amd64 (push) Successful in 4m4s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 5m50s
2025-11-12 21:29:59 +01:00
94db71a858 chore(deps): update docker.io/library/golang docker tag to v1.25.4
All checks were successful
Build / build-amd64 (pull_request) Successful in 1m30s
Lint Markdown files / markdown-lint (pull_request) Successful in 4s
Build / build-arm64 (pull_request) Successful in 4m25s
Build / build-amd64 (push) Successful in 1m29s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 4m25s
2025-11-05 23:05:48 +00:00
1198dc5559 chore(deps): update docker/setup-qemu-action action to v3.7.0
All checks were successful
Build / build-arm64 (pull_request) Successful in 4m25s
Lint Markdown files / markdown-lint (pull_request) Successful in 25s
Build / build-amd64 (pull_request) Successful in 1m52s
Build / build-amd64 (push) Successful in 1m33s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 4m21s
2025-11-05 17:07:00 +00:00
405d7abb25 style(ci): sort args
All checks were successful
Build / build-amd64 (push) Successful in 2m58s
Lint Markdown files / markdown-lint (push) Successful in 30s
Build / build-arm64 (push) Successful in 7m23s
2025-11-02 22:33:52 +01:00
c4a5b87082 docs(README): adapt example
All checks were successful
Build / build-amd64 (push) Successful in 2m21s
Lint Markdown files / markdown-lint (push) Successful in 4s
Update Docker Hub Description / update-description-on-hub-docker-io (push) Successful in 5s
Build / build-arm64 (push) Successful in 7m1s
2025-10-30 22:57:44 +01:00
d84cc78259 fix(ci): add missing DC_VERSION
Some checks failed
Build / build-amd64 (push) Has been cancelled
Build / build-arm64 (push) Has been cancelled
Lint Markdown files / markdown-lint (push) Has been cancelled
2025-10-30 22:56:44 +01:00
9 changed files with 57 additions and 80 deletions

View File

@@ -4,7 +4,7 @@ on:
push:
branches: [ "master" ]
paths:
- Makefile
- Dockerfile
env:
GIT_EMAIL: noreply@cryptic.systems
@@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5.0.0
- uses: actions/checkout@v6.0.1
with:
fetch-depth: 0
@@ -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}"
@@ -53,6 +53,7 @@ jobs:
git push origin "${defined_tag}"
- name: Trigger "Push tagged images" workflow
if: steps.check_change.outputs.changed == 'true'
uses: actions/github-script@v8.0.0
with:
script: |

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
@@ -20,8 +15,8 @@ jobs:
build-arm64:
runs-on: ubuntu-latest-arm64
steps:
- uses: actions/checkout@v5.0.0
- uses: docker/setup-qemu-action@v3.6.0
- 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
@@ -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 \
@@ -41,8 +33,8 @@ jobs:
build-amd64:
runs-on: ubuntu-latest-amd64
steps:
- uses: actions/checkout@v5.0.0
- uses: docker/setup-qemu-action@v3.6.0
- 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
@@ -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

@@ -15,7 +15,7 @@ jobs:
markdown-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5.0.0
- uses: DavidAnson/markdownlint-cli2-action@v20.0.0
- uses: actions/checkout@v6.0.1
- uses: DavidAnson/markdownlint-cli2-action@v21.0.0
with:
globs: '**/*.md'

View File

@@ -1,8 +1,5 @@
name: Release
env:
GOPROXY: ${{ vars.GOPROXY }}
on:
push:
tags:
@@ -30,12 +27,12 @@ jobs:
echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
- uses: actions/checkout@v5.0.0
- uses: actions/checkout@v6.0.1
with:
fetch-tags: true
ref: "${{ steps.version_extraction.outputs.version_raw }}"
- uses: docker/setup-qemu-action@v3.6.0
- uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.11.1
- uses: docker/login-action@v3.6.0
@@ -47,14 +44,12 @@ jobs:
- name: Build and push image
run: |
docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/arm64 \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--file Dockerfile \
--platform linux/arm64 \
--provenance false \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64 \
--push \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64 \
.
push-amd64:
@@ -72,12 +67,12 @@ jobs:
echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT
echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT
- uses: actions/checkout@v5.0.0
- uses: actions/checkout@v6.0.1
with:
fetch-tags: true
ref: "${{ steps.version_extraction.outputs.version_raw }}"
- uses: docker/setup-qemu-action@v3.6.0
- uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.11.1
- uses: docker/login-action@v3.6.0
@@ -89,14 +84,12 @@ jobs:
- name: Build and push image
run: |
docker buildx build \
--build-arg GONOSUMDB=${GONOSUMDB} \
--build-arg GOPRIVATE=${GOPRIVATE} \
--build-arg GOPROXY=${GOPROXY} \
--platform linux/amd64 \
--build-arg DC_VERSION=${{ steps.version_extraction.outputs.version_raw }} \
--file Dockerfile \
--platform linux/amd64 \
--provenance false \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \
--push \
--tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \
.
push-manifest:
@@ -159,4 +152,4 @@ jobs:
--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://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}

View File

@@ -10,10 +10,9 @@ on:
jobs:
update-description-on-hub-docker-io:
runs-on:
- ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5.0.0
- uses: actions/checkout@v6.0.1
- uses: peter-evans/dockerhub-description@v5.0.0
with:
username: ${{ secrets.DOCKER_IO_USERNAME }}

View File

@@ -1,21 +1,23 @@
FROM docker.io/library/golang:1.25.3-alpine3.21 AS build
FROM docker.io/library/ubuntu:24.04 AS download
ARG DC_VERSION=main
ARG GONOSUMDB
ARG GOPRIVATE
ARG GOPROXY
ARG DC_VERSION=v5.0.0
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.22
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 \

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=5.0.0
docker run \
--rm \
--volume ./path/to/docker-compose.yml:/workdir/docker-compose.yml:ro \
--volume "$(pwd):$(pwd)" \
--volume /var/run/docker.sock:/var/run/docker.sock \
--workdir /workdir \
git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION} \
ps
--workdir "$(pwd)" \
"git.cryptic.systems/volker.raschek/docker-compose:${IMAGE_VERSION}" \
version
```

View File

@@ -4,9 +4,11 @@
{
"customType": "regex",
"fileMatch": [
"^Dockerfile$",
"^README\\.md$"
],
"matchStrings": [
"ARG DC_VERSION=(?<currentValue>.*)",
"IMAGE_VERSION=(?<currentValue>.*)"
],
"datasourceTemplate": "github-releases",
@@ -31,6 +33,10 @@
],
"matchManagers": [
"regex"
],
"matchUpdateTypes": [
"minor",
"patch"
]
}
]