You've already forked docker-compose-docker
fix: migrate DC_VERSION to Dockerfile
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -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 \
|
||||||
|
|||||||
5
Makefile
5
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
|
# 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 \
|
||||||
|
|||||||
Reference in New Issue
Block a user