From 84acbf3c2c4730a9582f42ae1352629b029a9a5d Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Mon, 14 Mar 2022 16:38:44 +0100
Subject: [PATCH] using bullseye

---
 apps/rompr/Dockerfile | 27 ++++++++++++---------------
 apps/rompr/run-httpd  |  2 +-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/apps/rompr/Dockerfile b/apps/rompr/Dockerfile
index a8a886f..66cfacb 100644
--- a/apps/rompr/Dockerfile
+++ b/apps/rompr/Dockerfile
@@ -1,11 +1,9 @@
-FROM debian:buster-slim
+FROM cr.lan/debian-stable-php-fpm
 
 ARG ROMPR_VERSION=1.60.1
 # Install packages
 ENV DEBIAN_FRONTEND noninteractive
-RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \
-	sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \	 
-	apt-get update && \
+RUN apt-get update && \
   	apt-get -y install \
       nginx \
       php-fpm \
@@ -21,8 +19,7 @@ RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.li
       php-sqlite3 \
       php-intl
 # CLeanup	
-RUN	apt-get remove -y --purge ${DEV_PKGS} && \
-	apt-get autoremove --purge -y && \
+RUN	apt-get autoremove --purge -y && \
 	apt-get clean -y && \ 
 	rm -rf /var/lib/apt/lists/* && \
 	rm -rf /var/cache/apt/* /tmp/* /var/tmp/* /var/log/*
@@ -37,17 +34,17 @@ RUN chown -R www-data:www-data /app/rompr /rompr
 COPY nginx_default /etc/nginx/sites-available/default
 RUN mkdir -p /run/php/
 #Environment variables to configure php
-RUN sed -ri -e  's/^allow_url_fopen =.*/allow_url_fopen = On/g' /etc/php/7.3/fpm/php.ini
-RUN sed -ri -e  's/^memory_limit =.*/memory_limit = 128M/g' /etc/php/7.3/fpm/php.ini
-RUN sed -ri -e  's/^max_execution_time =.*/max_execution_time = 1800/g' /etc/php/7.3/fpm/php.ini
-RUN sed -ri -e  's/^post_max_size =.*/post_max_size = 256M/g' /etc/php/7.3/fpm/php.ini
-RUN sed -ri -e  's/^upload_max_filesize =.*/upload_max_filesize = 8M/g' /etc/php/7.3/fpm/php.ini
-RUN sed -ri -e  's/^max_file_uploads =.*/max_file_uploads = 50/g' /etc/php/7.3/fpm/php.ini
-RUN sed -ri -e  's/^display_errors =.*/display_errors = On/g' /etc/php/7.3/fpm/php.ini
-RUN sed -ri -e  's/^display_startup_errors =.*/display_startup_errors = On/g' /etc/php/7.3/fpm/php.ini
+RUN sed -ri -e  's/^allow_url_fopen =.*/allow_url_fopen = On/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^memory_limit =.*/memory_limit = 128M/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^max_execution_time =.*/max_execution_time = 1800/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^post_max_size =.*/post_max_size = 256M/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^upload_max_filesize =.*/upload_max_filesize = 8M/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^max_file_uploads =.*/max_file_uploads = 50/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^display_errors =.*/display_errors = On/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^display_startup_errors =.*/display_startup_errors = On/g' /etc/php/7.4/fpm/php.ini
 
 RUN echo "<?php phpinfo(); ?>" > /app/rompr/phpinfo.php
-RUN update-rc.d php7.3-fpm defaults
+RUN update-rc.d php7.4-fpm defaults
 COPY run-httpd /usr/local/bin/
 RUN chmod 755 /usr/local/bin/run-httpd
 EXPOSE 80
diff --git a/apps/rompr/run-httpd b/apps/rompr/run-httpd
index 3d2198c..bc2855b 100644
--- a/apps/rompr/run-httpd
+++ b/apps/rompr/run-httpd
@@ -3,5 +3,5 @@ rm -f /var/run/nginx.pid
 mkdir -p /var/log/nginx
 set -e
 
-/etc/init.d/php7.3-fpm restart
+/etc/init.d/php7.4-fpm restart
 exec /usr/sbin/nginx -g 'daemon off;'