From 34c560aa40022dc8f45404501f9e840209caeaf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20K=C3=BCffner?=
 <11882946+mkuf@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:24:59 +0200
Subject: [PATCH] Use bookworm based images for all containers (#81)

* moonraker: update to bookworm based images
* klipperscreen: upgrade to bookworm base images
* ustreamer: upgrade to bookworm base images
* klipper: upgrade to bookworm base images and use python3
---
 docker/klipper/Dockerfile       | 12 ++++++------
 docker/klipperscreen/Dockerfile |  4 ++--
 docker/moonraker/Dockerfile     |  8 ++++----
 docker/ustreamer/Dockerfile     |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile
index 125eeb0..f621442 100644
--- a/docker/klipper/Dockerfile
+++ b/docker/klipper/Dockerfile
@@ -1,6 +1,6 @@
 ## Get Klipper Source and Build venv
 ##
-FROM python:2 as build
+FROM python:3-bookworm as build
 
 ARG REPO=https://github.com/Klipper3d/klipper
 ARG VERSION=master
@@ -12,7 +12,7 @@ RUN git clone ${REPO} klipper \
  && git checkout ${VERSION} \
  && rm -rf .git
 
-RUN virtualenv -p python2 venv \
+RUN python -m venv venv \
  && venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \
  && venv/bin/pip install numpy \
  && venv/bin/python -m compileall klipper/klippy \
@@ -22,7 +22,7 @@ RUN virtualenv -p python2 venv \
 
 ## Klippy Runtime Image
 ##
-FROM python:2-slim as run
+FROM python:3-slim-bookworm as run
 
 WORKDIR /opt
 RUN groupadd klipper --gid 1000 \
@@ -44,14 +44,14 @@ CMD ["-I", "printer_data/run/klipper.tty", "-a", "printer_data/run/klipper.sock"
 
 ## Image for building MCU code including other tooling
 ##
-FROM debian:bullseye as tools
+FROM debian:bookworm as tools
 
 WORKDIR /opt
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update \
  && apt install -y \
       sudo \
-      virtualenv python-dev libffi-dev build-essential pkg-config\
+      virtualenv python3-dev libffi-dev build-essential pkg-config\
       libncurses-dev \
       avrdude gcc-avr binutils-avr avr-libc \
       stm32flash dfu-util libnewlib-arm-none-eabi \
@@ -78,7 +78,7 @@ RUN cd klipper \
 
 ## Runtime image for the klipper_mcu binary
 ##
-FROM debian:bullseye-slim as hostmcu
+FROM debian:bookworm-slim as hostmcu
 
 RUN apt update \
  && apt install -y gpiod \
diff --git a/docker/klipperscreen/Dockerfile b/docker/klipperscreen/Dockerfile
index e72c7b0..4eb45ac 100644
--- a/docker/klipperscreen/Dockerfile
+++ b/docker/klipperscreen/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3 as build
+FROM python:3-bookworm as build
 
 ARG REPO=https://github.com/jordanruthe/KlipperScreen
 ARG VERSION=master
@@ -18,7 +18,7 @@ RUN git clone ${REPO} klipperscreen \
 RUN python -m venv venv \
  && venv/bin/pip install -r klipperscreen/scripts/KlipperScreen-requirements.txt
 
-FROM python:3-slim as run
+FROM python:3-slim-bookworm as run
 
 RUN apt update \
  && apt install -y \
diff --git a/docker/moonraker/Dockerfile b/docker/moonraker/Dockerfile
index e978cce..cbd3a11 100644
--- a/docker/moonraker/Dockerfile
+++ b/docker/moonraker/Dockerfile
@@ -1,5 +1,5 @@
 ## Get Code and Build venv
-FROM python:3-bullseye as build
+FROM python:3-bookworm as build
 
 ARG REPO=https://github.com/Arksine/moonraker
 ARG VERSION=master
@@ -15,7 +15,7 @@ RUN python -m venv venv \
  && venv/bin/pip install -r moonraker/scripts/moonraker-requirements.txt
 
 ## Runtime Image
-FROM python:3-slim-bullseye as run
+FROM python:3-slim-bookworm as run
 
 RUN apt update \
  && apt install -y \
@@ -23,11 +23,11 @@ RUN apt update \
       python3-libgpiod \
       curl \
       libcurl4 \
-      libssl1.1 \
+      libssl3 \
       liblmdb0 \
       libsodium23 \
       libjpeg62-turbo \
-      libtiff5 \
+      libtiff6 \
       libxcb1 \
       zlib1g \
       iproute2 \
diff --git a/docker/ustreamer/Dockerfile b/docker/ustreamer/Dockerfile
index 4cf2920..44cc116 100644
--- a/docker/ustreamer/Dockerfile
+++ b/docker/ustreamer/Dockerfile
@@ -1,5 +1,5 @@
 ## Get Code and make
-FROM debian:bullseye-slim as build
+FROM debian:bookworm-slim as build
 
 ARG REPO=https://github.com/pikvm/ustreamer
 ARG VERSION=master
@@ -27,7 +27,7 @@ RUN cd ustreamer \
  && make
 
 ## Runtime Image
-FROM debian:bullseye-slim as run
+FROM debian:bookworm-slim as run
 
 RUN apt update \
  && apt install -y \