diff --git a/.gitea/workflows/auto-release.yaml b/.gitea/workflows/auto-release.yaml index c1c4a08..2b2d74b 100644 --- a/.gitea/workflows/auto-release.yaml +++ b/.gitea/workflows/auto-release.yaml @@ -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 diff --git a/Dockerfile b/Dockerfile index d030c00..146a46c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ 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); \ - echo "${NAME}" && \ - echo $(uname) && \ apt update --yes && \ apt install --yes curl && \ curl \ diff --git a/Makefile b/Makefile index f5e4549..90f44d0 100644 --- a/Makefile +++ b/Makefile @@ -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 # 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. @@ -22,7 +18,6 @@ DC_IMAGE_FULLY_QUALIFIED=${DC_IMAGE_REGISTRY_NAME}/${DC_IMAGE_NAMESPACE}/${DC_IM PHONY:=container-image/build container-image/build: ${CONTAINER_RUNTIME} build \ - --build-arg DC_VERSION=${DC_VERSION} \ --file Dockerfile \ --no-cache \ --pull \