Skip to content

Commit f36aae7

Browse files
chore(deps): update dependency canonicalwebteam.flask-base to v2.4.0 (#5471)
* chore(deps): update dependency canonicalwebteam.flask-base to v2.4.0 * Update dockerfile for python venv compatibility & Noble --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Julie Muzina <jmuzina@jmuzina.io>
1 parent f1df6b1 commit f36aae7

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

Dockerfile

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33

44
# Build stage: Install python dependencies
55
# ===
6-
FROM ubuntu:jammy AS python-dependencies
7-
RUN apt-get update && apt-get install --no-install-recommends --yes python3-pip python3-setuptools
6+
FROM ubuntu:noble AS python-dependencies
7+
RUN apt-get update && apt-get install --no-install-recommends --yes \
8+
python3-pip python3-setuptools python3-wheel python3-venv \
9+
build-essential git ca-certificates
810
ADD requirements.txt /tmp/requirements.txt
911
RUN pip3 config set global.disable-pip-version-check true
10-
RUN --mount=type=cache,target=/root/.cache/pip pip3 install --user --requirement /tmp/requirements.txt
11-
12-
12+
RUN python3 -m venv /venv
13+
ENV PATH="/venv/bin:${PATH}"
14+
RUN --mount=type=cache,target=/root/.cache/pip pip3 install --requirement /tmp/requirements.txt
1315
# Build stage: Install yarn dependencies
1416
# ===
1517
FROM node:22 AS yarn-dependencies
@@ -31,17 +33,18 @@ RUN yarn run build
3133

3234
# Build the production image
3335
# ===
34-
FROM ubuntu:jammy
36+
FROM ubuntu:noble
3537

3638
# Set up environment
3739
ENV LANG C.UTF-8
3840
WORKDIR /srv
3941

4042
# Install python and import python dependencies
41-
RUN apt-get update && apt-get install --no-install-recommends --yes python3-setuptools python3-lib2to3 python3-pkg-resources
42-
COPY --from=python-dependencies /root/.local/lib/python3.10/site-packages /root/.local/lib/python3.10/site-packages
43-
COPY --from=python-dependencies /root/.local/bin /root/.local/bin
44-
ENV PATH="/root/.local/bin:${PATH}"
43+
RUN apt-get update && apt-get install --no-install-recommends --yes \
44+
python3-setuptools python3-lib2to3 python3-pkg-resources \
45+
ca-certificates libsodium-dev gpg
46+
COPY --from=python-dependencies /venv /venv
47+
ENV PATH="/venv/bin:${PATH}"
4548

4649
# Import code, build assets and mirror list
4750
ADD . .

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
canonicalwebteam.flask-base==2.1.0
1+
canonicalwebteam.flask-base==2.4.0
22
canonicalwebteam.templatefinder==1.0.0
33
canonicalwebteam.search==2.1.1
44
canonicalwebteam.image-template==1.5.0

0 commit comments

Comments
 (0)