From 28348417fd4bc9e23924af50e246d563de558b3f Mon Sep 17 00:00:00 2001
From: Vilhelm Prytz <vilhelm@prytznet.se>
Date: Sat, 6 Jan 2024 17:47:14 +0100
Subject: [PATCH] remove debian stretch, add debian bookworm

---
 .github/workflows/docker-image.yml       | 16 ++++++++--------
 docker-images/debian-bookworm/Dockerfile | 16 ++++++++++++++++
 docker-images/debian-stretch/Dockerfile  | 19 -------------------
 images/other/multi-theft-auto.json       |  6 +++---
 4 files changed, 27 insertions(+), 30 deletions(-)
 create mode 100644 docker-images/debian-bookworm/Dockerfile
 delete mode 100644 docker-images/debian-stretch/Dockerfile

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 0aa7625..3f058c3 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -29,14 +29,6 @@ jobs:
           tags: wilfreddev/alpine:latest
           platforms: linux/amd64,linux/arm64/v8
 
-      # Debian stretch
-      - name: Build and push wilfreddev/debian:stretch
-        uses: docker/build-push-action@v2
-        with:
-          context: docker-images/debian-stretch
-          push: true
-          tags: wilfreddev/debian:stretch
-
       # Debian bullseye
       - name: Build and push wilfreddev/debian:bullseye
         uses: docker/build-push-action@v2
@@ -45,6 +37,14 @@ jobs:
           push: true
           tags: wilfreddev/debian:bullseye
 
+      # Debian bookworm
+      - name: Build and push wilfreddev/debian:bookworm
+        uses: docker/build-push-action@v2
+        with:
+          context: docker-images/debian-bookworm
+          push: true
+          tags: wilfreddev/debian:bookworm
+
       # Java 8
       - name: Build and push wilfreddev/java:8
         uses: docker/build-push-action@v2
diff --git a/docker-images/debian-bookworm/Dockerfile b/docker-images/debian-bookworm/Dockerfile
new file mode 100644
index 0000000..71cbf51
--- /dev/null
+++ b/docker-images/debian-bookworm/Dockerfile
@@ -0,0 +1,16 @@
+FROM debian:bookworm-slim
+
+LABEL author="Vilhelm Prytz" maintainer="info@wilfredproject.org"
+
+ENV DEBAIN_FRONTEND noninteractive
+ENV HOME /server
+
+RUN apt update && apt upgrade -y
+
+RUN apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 libfontconfig libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev libzip4
+
+RUN update-locale lang=en_US.UTF-8 && dpkg-reconfigure --frontend noninteractive locales
+
+RUN set -x && apt-get update && apt-get upgrade -y && dpkg --add-architecture i386 && apt-get update && apt-get install -y lib32z1 && apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* && useradd -d /server container
+
+WORKDIR ${HOME}
diff --git a/docker-images/debian-stretch/Dockerfile b/docker-images/debian-stretch/Dockerfile
deleted file mode 100644
index a4c8a00..0000000
--- a/docker-images/debian-stretch/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM debian:stretch
-
-LABEL author="Vilhelm Prytz" maintainer="info@wilfredproject.org"
-
-ENV HOME /server
-
-RUN set -x \
-	&& apt-get update \
-	&& apt-get upgrade -y \
-    && dpkg --add-architecture i386 \
-    && apt-get update \
-	&& apt-get install -y \
-		lib32z1 lib32ncurses5 screen \
-	&& apt-get clean autoclean \
-	&& apt-get autoremove -y \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& useradd -d /server container
-
-WORKDIR ${HOME}
diff --git a/images/other/multi-theft-auto.json b/images/other/multi-theft-auto.json
index 89910e1..340ddfa 100644
--- a/images/other/multi-theft-auto.json
+++ b/images/other/multi-theft-auto.json
@@ -5,7 +5,7 @@
   "uid": "multi-theft-auto",
   "name": "Multi Theft Auto",
   "author": "info@wilfredproject.org",
-  "docker_image": "wilfreddev/debian:stretch",
+  "docker_image": "wilfreddev/debian:bookworm",
   "command": "./mta-server64",
   "default_port": "22003",
   "user": "container",
@@ -15,7 +15,7 @@
     "files": []
   },
   "installation": {
-    "docker_image": "wilfreddev/debian:stretch",
+    "docker_image": "wilfreddev/debian:bookworm",
     "shell": "/bin/bash",
     "script": [
       "apt update -y",
@@ -31,4 +31,4 @@
     ]
   },
   "variables": []
-}
+}
\ No newline at end of file