diff --git a/Dockerfile b/Dockerfile index 0189f46c8..e77e71373 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM python:${PYTHON_VERSION} WORKDIR /src COPY . . -ARG VERSION +ARG VERSION=0.0.0.dev0 RUN --mount=type=cache,target=/cache/pip \ PIP_CACHE_DIR=/cache/pip \ SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} \ diff --git a/Dockerfile-docs b/Dockerfile-docs index 14d615c43..4671d2c49 100644 --- a/Dockerfile-docs +++ b/Dockerfile-docs @@ -13,7 +13,7 @@ RUN addgroup --gid $gid sphinx \ WORKDIR /src COPY . . -ARG VERSION +ARG VERSION=0.0.0.dev0 RUN --mount=type=cache,target=/cache/pip \ PIP_CACHE_DIR=/cache/pip \ SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} \ diff --git a/Makefile b/Makefile index d1c07ac73..7af4e7d6b 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ endif SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER ?= $(shell git describe --match '[0-9]*' --dirty='.m' --always --tags 2>/dev/null | sed -r 's/-([0-9]+)/.dev\1/' | sed 's/-/+/') ifeq ($(SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER),) - SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER = "dev" + SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER = "0.0.0.dev0" endif .PHONY: all @@ -33,7 +33,7 @@ build-dind-ssh: --build-arg VERSION=${SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER} \ --build-arg ENGINE_VERSION=${TEST_ENGINE_VERSION} \ --build-arg API_VERSION=${TEST_API_VERSION} \ - --build-arg APT_MIRROR . + . .PHONY: build build: @@ -42,7 +42,7 @@ build: -t docker-sdk-python3 \ -f tests/Dockerfile \ --build-arg VERSION=${SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER} \ - --build-arg APT_MIRROR . + . .PHONY: build-docs build-docs: diff --git a/tests/Dockerfile b/tests/Dockerfile index c0af8e85f..1d967e563 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -28,7 +28,7 @@ RUN curl -sSL -o /opt/docker-credential-pass.tar.gz \ WORKDIR /src COPY . . -ARG VERSION +ARG VERSION=0.0.0.dev0 RUN --mount=type=cache,target=/cache/pip \ PIP_CACHE_DIR=/cache/pip \ SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} \