Skip to content

Commit 62a2c7c

Browse files
authored
Merge pull request #125 from mkuf/renovate/python-3.x
chore(deps): update python docker tag to v3.12
2 parents 3d6d6e9 + ddd5ba5 commit 62a2c7c

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

docker/klipper/Dockerfile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11
## Get Klipper Source and Build venv
22
##
3-
FROM python:3.11-bookworm as build
3+
FROM python:3.12-bookworm as build
44

5-
ARG REPO=https://github.com/Klipper3d/klipper
6-
ARG VERSION=master
5+
RUN apt update \
6+
&& apt install -y cmake \
7+
&& apt clean
78

89
WORKDIR /opt
10+
COPY requirements-prind.txt .
11+
12+
RUN python -m venv venv \
13+
&& venv/bin/pip install -r requirements-prind.txt
14+
15+
ARG REPO=https://github.com/Klipper3d/klipper
16+
ARG VERSION=master
917

1018
RUN git clone ${REPO} klipper \
1119
&& cd klipper \
1220
&& git checkout ${VERSION} \
1321
&& rm -rf .git
1422

15-
RUN python -m venv venv \
16-
&& venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \
17-
&& venv/bin/pip install numpy==1.25.2 \
23+
RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \
1824
&& venv/bin/python -m compileall klipper/klippy \
1925
&& venv/bin/python klipper/klippy/chelper/__init__.py
2026
###
2127

2228

2329
## Klippy Runtime Image
2430
##
25-
FROM python:3.11-slim-bookworm as run
31+
FROM python:3.12-slim-bookworm as run
2632

2733
WORKDIR /opt
2834
RUN groupadd klipper --gid 1000 \
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
numpy==1.26.4

docker/klipperscreen/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-bookworm as build
1+
FROM python:3.12-bookworm as build
22

33
ARG REPO=https://github.com/KlipperScreen/KlipperScreen
44
ARG VERSION=master
@@ -18,7 +18,7 @@ RUN git clone ${REPO} klipperscreen \
1818
RUN python -m venv venv \
1919
&& venv/bin/pip install -r klipperscreen/scripts/KlipperScreen-requirements.txt
2020

21-
FROM python:3.11-slim-bookworm as run
21+
FROM python:3.12-slim-bookworm as run
2222

2323
RUN apt update \
2424
&& apt install -y \

docker/moonraker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Get Code and Build venv
2-
FROM python:3.11-bookworm as build
2+
FROM python:3.12-bookworm as build
33

44
ARG REPO=https://github.com/Arksine/moonraker
55
ARG VERSION=master
@@ -15,7 +15,7 @@ RUN python -m venv venv \
1515
&& venv/bin/pip install -r moonraker/scripts/moonraker-requirements.txt
1616

1717
## Runtime Image
18-
FROM python:3.11-slim-bookworm as run
18+
FROM python:3.12-slim-bookworm as run
1919

2020
RUN apt update \
2121
&& apt install -y \

0 commit comments

Comments
 (0)