Skip to content

Commit 78652cb

Browse files
committed
build(container): update poetry and pdv
Fix use of version variables passed in container.yaml workflow.
1 parent e5a3eb7 commit 78652cb

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Diff for: .github/workflows/container.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ env:
1313
REGISTRY: ghcr.io
1414
IMAGE_NAME: ${{ github.repository }}
1515
PYTHON_VERSION: "3.12"
16-
POETRY_VERSION: "1.3.2"
17-
POETRY_DYNAMIC_VERSIONING_VERSION: "1.1.0"
16+
POETRY_VERSION: "1.8.3"
17+
POETRY_DYNAMIC_VERSIONING_VERSION: "1.4.1"
1818
QEMU_PLATFORMS: "linux/amd64,linux/arm64"
1919

2020
jobs:

Diff for: Containerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
ARG BASE_IMAGE="docker.io/python:3.12-alpine"
1+
ARG PYTHON_VERSION="3.12"
2+
ARG BASE_IMAGE="docker.io/python:${PYTHON_VERSION}-alpine"
23

34
FROM ${BASE_IMAGE} AS poetry
45

56
RUN apk add --no-cache \
67
build-base \
78
libffi-dev
8-
RUN pip install poetry==1.3.2
9+
ARG POETRY_VERSION="1.8.3"
10+
RUN pip install poetry==${POETRY_VERSION}
911

1012

1113
FROM poetry AS builder
@@ -16,7 +18,8 @@ RUN python -m venv /app && \
1618
source /app/bin/activate && \
1719
poetry install --only main --no-root
1820

19-
RUN poetry self add "poetry-dynamic-versioning[plugin]==1.1.0"
21+
ARG POETRY_DYNAMIC_VERSIONING_VERSION="1.4.1"
22+
RUN poetry self add "poetry-dynamic-versioning[plugin]==${POETRY_DYNAMIC_VERSIONING_VERSION}"
2023
RUN apk add --no-cache git
2124
COPY tsdapiclient ./tsdapiclient
2225
COPY .git ./.git

0 commit comments

Comments
 (0)