From 02b41673fda302356a219b6e7775646292bee48a Mon Sep 17 00:00:00 2001
From: Chris <christian@haschek.at>
Date: Sun, 19 Nov 2023 13:48:47 +0100
Subject: [PATCH] upgrade to python3 and php8

---
 docker/Dockerfile      | 7 ++++---
 docker/rootfs/start.sh | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index faea6b0..a1dd9e2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,9 @@
-FROM alpine:3.14.2
+FROM alpine:3.18
 
 LABEL org.opencontainers.image.source = "https://github.com/HaschekSolutions/opentrashmail"
 
-RUN apk add --no-cache bash python2 socat wget php7-fileinfo php7-session curl git php php-curl nginx php-openssl php-mbstring php-json php-gd php-dom php-fpm
+RUN apk add --no-cache bash python3 py3-pip socat wget php-fileinfo php-session curl git php php-curl nginx php-openssl php-mbstring php-json php-gd php-dom php-fpm
+RUN pip3 install aiosmtpd
 #RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer 
 RUN mkdir -p /var/www/opentrashmail
 WORKDIR /var/www/opentrashmail
@@ -16,7 +17,7 @@ RUN chmod +x /etc/start.sh
 ADD docker/rootfs/nginx.conf /etc/nginx/http.d/default.conf
 RUN mkdir -p /run/nginx
 RUN mkdir -p /var/log/nginx
-RUN sed -i 's/nobody/nginx/g' /etc/php7/php-fpm.d/www.conf
+RUN sed -i 's/nobody/nginx/g' /etc/php81/php-fpm.d/www.conf
 
 WORKDIR /var/www/opentrashmail
 
diff --git a/docker/rootfs/start.sh b/docker/rootfs/start.sh
index e250d81..300360f 100644
--- a/docker/rootfs/start.sh
+++ b/docker/rootfs/start.sh
@@ -5,7 +5,7 @@ echo 'Starting Open Trashmail'
 cd /var/www/opentrashmail
 
 echo ' [+] Starting php'
-php-fpm7
+php-fpm81
 
 if [[ ${SKIP_FILEPERMISSIONS:=false} != true ]]; then
   chown -R nginx:nginx /var/www/
@@ -48,4 +48,4 @@ _buildConfig() {
 _buildConfig > /var/www/opentrashmail/config.ini
 
 echo ' [+] Starting Mailserver'
-su - nginx -s /bin/ash -c 'cd /var/www/opentrashmail/python;python -u mailserver.py >> /var/www/opentrashmail/logs/mailserver.log 2>&1 '
+su - nginx -s /bin/ash -c 'cd /var/www/opentrashmail/python;python3 -u mailserver3.py >> /var/www/opentrashmail/logs/mailserver.log 2>&1 '