Skip to content

Commit 7fca3e7

Browse files
committed
fix version.py included in Docker
1 parent ef8f5b6 commit 7fca3e7

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Dockerfile.cli

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ FROM base as builder
1111
COPY pyproject.toml build.py poetry.lock README.rst CHANGES.rst /code/renku/
1212
WORKDIR /code/renku
1313
RUN poetry export --without-hashes -f requirements.txt --output /tmp/requirements.txt && \
14-
pip install -r /tmp/requirements.txt
14+
pip install -r /tmp/requirements.txt && \
15+
pip install poetry-dynamic-versioning
1516

1617
COPY .git /code/renku/.git
1718
COPY renku /code/renku/renku
@@ -20,6 +21,8 @@ COPY renku /code/renku/renku
2021
# renku-python is installed in the image. This is the default for chartpress builds.
2122
ARG CLEAN_INSTALL
2223
RUN if [ -n "${CLEAN_INSTALL}" ]; then git reset --hard ; fi
24+
# manually update version.py
25+
RUN poetry-dynamic-versioning
2326

2427
RUN pip wheel --wheel-dir /wheels . && \
2528
pip install --no-index --no-warn-script-location --force --root=/pythonroot/ /wheels/*.whl && \

Dockerfile.svc

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ FROM base as builder
1111
COPY pyproject.toml build.py poetry.lock README.rst CHANGES.rst /code/renku/
1212
WORKDIR /code/renku
1313
RUN poetry export --without-hashes -f requirements.txt --output /tmp/requirements.txt && \
14-
pip install -r /tmp/requirements.txt
14+
pip install -r /tmp/requirements.txt && \
15+
pip install poetry-dynamic-versioning
1516

1617
COPY .git /code/renku/.git
1718
COPY renku /code/renku/renku
@@ -20,6 +21,8 @@ COPY renku /code/renku/renku
2021
# renku-python is installed in the image. This is the default for chartpress builds.
2122
ARG CLEAN_INSTALL
2223
RUN if [ -n "${CLEAN_INSTALL}" ]; then git reset --hard ; fi
24+
# manually update version.py
25+
RUN poetry-dynamic-versioning
2326

2427
RUN pip wheel --wheel-dir /wheels .[service] && \
2528
pip install --no-index --no-warn-script-location --force --root=/pythonroot/ /wheels/*.whl && \

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
[tool.poetry]
2222
name = "renku"
23-
version = "1.0.0-rc1.dev39+g5c515994" # placeholder, see poetry-dynamic-versioning
23+
version = "1.0.0-rc1.dev46+gef8f5b67" # placeholder, see poetry-dynamic-versioning
2424
description = "Python SDK and CLI for the Renku platform."
2525
license = "Apache License 2.0"
2626
keywords = ["Renku", "CLI"]
@@ -267,7 +267,7 @@ use_parentheses = true
267267
line_length = 120
268268

269269
[tool.poetry-dynamic-versioning]
270-
enable = false
270+
enable = true
271271
vcs = "git"
272272
dirty = true
273273
format-jinja = """

0 commit comments

Comments
 (0)