Compare commits

...

2 Commits

Author SHA1 Message Date
53799926cc fix
All checks were successful
Auto release / tag_on_change (push) Successful in 5s
Build / build-amd64 (push) Successful in 34s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 1m18s
2025-12-05 17:36:02 +01:00
9ea01a091b fix: migrate DC_VERSION to Dockerfile 2025-12-05 16:31:46 +01:00
3 changed files with 6 additions and 12 deletions

View File

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

View File

@@ -1,10 +1,9 @@
FROM docker.io/library/ubuntu:24.04 AS download FROM docker.io/library/ubuntu:24.04 AS download
ARG DC_VERSION # renovate: datasource=github-releases depName=docker/compose
ARG DC_VERSION=v5.0.0
RUN NAME=docker-compose-$(uname | tr [:upper:] [:lower:])-$(uname -m); \ RUN NAME=docker-compose-$(uname | tr [:upper:] [:lower:])-$(uname -m); \
echo "${NAME}" && \
echo $(uname) && \
apt update --yes && \ apt update --yes && \
apt install --yes curl && \ apt install --yes curl && \
curl \ curl \

View File

@@ -1,7 +1,3 @@
# DC_VERSION
# Only required to install a specify version
DC_VERSION?=v5.0.0 # 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
# run a container image. # run a container image.
@@ -22,7 +18,6 @@ DC_IMAGE_FULLY_QUALIFIED=${DC_IMAGE_REGISTRY_NAME}/${DC_IMAGE_NAMESPACE}/${DC_IM
PHONY:=container-image/build PHONY:=container-image/build
container-image/build: container-image/build:
${CONTAINER_RUNTIME} build \ ${CONTAINER_RUNTIME} build \
--build-arg DC_VERSION=${DC_VERSION} \
--file Dockerfile \ --file Dockerfile \
--no-cache \ --no-cache \
--pull \ --pull \