Skip to content

Commit fba6ffe

Browse files
authored
Merge pull request #3267 from thaJeztah/add_default_version
Set a dummy-version if none set, and remove unused APT_MIRROR build-arg
2 parents bb0edd1 + 99ce2e6 commit fba6ffe

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM python:${PYTHON_VERSION}
66
WORKDIR /src
77
COPY . .
88

9-
ARG VERSION
9+
ARG VERSION=0.0.0.dev0
1010
RUN --mount=type=cache,target=/cache/pip \
1111
PIP_CACHE_DIR=/cache/pip \
1212
SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} \

Dockerfile-docs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN addgroup --gid $gid sphinx \
1313
WORKDIR /src
1414
COPY . .
1515

16-
ARG VERSION
16+
ARG VERSION=0.0.0.dev0
1717
RUN --mount=type=cache,target=/cache/pip \
1818
PIP_CACHE_DIR=/cache/pip \
1919
SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} \

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ endif
1313

1414
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/-/+/')
1515
ifeq ($(SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER),)
16-
SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER = "dev"
16+
SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER = "0.0.0.dev0"
1717
endif
1818

1919
.PHONY: all
@@ -33,7 +33,7 @@ build-dind-ssh:
3333
--build-arg VERSION=${SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER} \
3434
--build-arg ENGINE_VERSION=${TEST_ENGINE_VERSION} \
3535
--build-arg API_VERSION=${TEST_API_VERSION} \
36-
--build-arg APT_MIRROR .
36+
.
3737

3838
.PHONY: build
3939
build:
@@ -42,7 +42,7 @@ build:
4242
-t docker-sdk-python3 \
4343
-f tests/Dockerfile \
4444
--build-arg VERSION=${SETUPTOOLS_SCM_PRETEND_VERSION_DOCKER} \
45-
--build-arg APT_MIRROR .
45+
.
4646

4747
.PHONY: build-docs
4848
build-docs:

tests/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN curl -sSL -o /opt/docker-credential-pass.tar.gz \
2828
WORKDIR /src
2929
COPY . .
3030

31-
ARG VERSION
31+
ARG VERSION=0.0.0.dev0
3232
RUN --mount=type=cache,target=/cache/pip \
3333
PIP_CACHE_DIR=/cache/pip \
3434
SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} \

0 commit comments

Comments
 (0)