diff --git a/_CI-CD/debian-stable-php-fpm/Dockerfile b/_CI-CD/debian-stable-php-fpm/Dockerfile index c7de639..22afcad 100644 --- a/_CI-CD/debian-stable-php-fpm/Dockerfile +++ b/_CI-CD/debian-stable-php-fpm/Dockerfile @@ -1,11 +1,11 @@ -FROM cr.wks/debian-stable +FROM debian:stable AS baseimage ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y \ dnsutils procps nmap bash iputils-ping bash openssl \ php-fpm php-zip php-sqlite3 php-pgsql php-mysqli php-json php-readline \ - php-xml php-ldap php-imap php-intl php-xmlrpc php-imagick php-gd php-cli php-curl \ - php-bz2 php-mbstring php-memcache php-redis + php-xml php-intl php-xmlrpc php-imagick php-gd php-cli php-curl \ + php-bz2 php-mbstring #cleanup RUN apt-get remove -y --purge man-db ;\ @@ -14,6 +14,8 @@ RUN apt-get remove -y --purge man-db ;\ rm -rf /var/lib/apt/lists/* ;\ rm -rf /var/cache/apt/* -ADD etc_php-fpm/www.conf /etc/php/7.4/fpm/pool.d +FROM baseimage as final + +ADD etc_php-fpm/www.conf /etc/php/8.4/fpm/pool.d ADD docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file diff --git a/apps/rompr/Dockerfile b/apps/rompr/Dockerfile index f0c183d..aad71fb 100644 --- a/apps/rompr/Dockerfile +++ b/apps/rompr/Dockerfile @@ -1,6 +1,6 @@ -FROM cr.wks/debian-stable-php-fpm +FROM cr.chaos/debian-stable-php-fpm as baseimage -ARG ROMPR_VERSION=2.17 +ARG ROMPR_VERSION=2.24 # Install packages ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get -y install \ @@ -18,21 +18,24 @@ RUN mkdir -p /app /rompr RUN unzip -d /app rompr.zip && rm rompr.zip RUN ln -sf /rompr/prefs /app/rompr/prefs; ln -sf /rompr/albumart /app/rompr/albumart; RUN chown -R www-data:www-data /app/rompr /rompr -RUN pwd; ls -la .;ls -la /etc/php/*/fpm +RUN pwd; ls -la .;ls -la /etc/php/ ADD files/nginx_default /etc/nginx/sites-available/default RUN mkdir -p /run/php/ + +FROM baseimage as final + #Environment variables to configure php -RUN sed -ri -e 's/^allow_url_fopen =.*/allow_url_fopen = On/g' /etc/php/8.2/fpm/php.ini && \ - sed -ri -e 's/^memory_limit =.*/memory_limit = 128M/g' /etc/php/8.2/fpm/php.ini && \ - sed -ri -e 's/^max_execution_time =.*/max_execution_time = 1800/g' /etc/php/8.2/fpm/php.ini && \ - sed -ri -e 's/^post_max_size =.*/post_max_size = 256M/g' /etc/php/8.2/fpm/php.ini && \ - sed -ri -e 's/^upload_max_filesize =.*/upload_max_filesize = 8M/g' /etc/php/8.2/fpm/php.ini && \ - sed -ri -e 's/^max_file_uploads =.*/max_file_uploads = 50/g' /etc/php/8.2/fpm/php.ini && \ - sed -ri -e 's/^display_errors =.*/display_errors = On/g' /etc/php/8.2/fpm/php.ini && \ - sed -ri -e 's/^display_startup_errors =.*/display_startup_errors = On/g' /etc/php/8.2/fpm/php.ini +RUN sed -ri -e 's/^allow_url_fopen =.*/allow_url_fopen = On/g' /etc/php/8.4/fpm/php.ini && \ + sed -ri -e 's/^memory_limit =.*/memory_limit = 128M/g' /etc/php/8.4/fpm/php.ini && \ + sed -ri -e 's/^max_execution_time =.*/max_execution_time = 1800/g' /etc/php/8.4/fpm/php.ini && \ + sed -ri -e 's/^post_max_size =.*/post_max_size = 256M/g' /etc/php/8.4/fpm/php.ini && \ + sed -ri -e 's/^upload_max_filesize =.*/upload_max_filesize = 8M/g' /etc/php/8.4/fpm/php.ini && \ + sed -ri -e 's/^max_file_uploads =.*/max_file_uploads = 50/g' /etc/php/8.4/fpm/php.ini && \ + sed -ri -e 's/^display_errors =.*/display_errors = On/g' /etc/php/8.4/fpm/php.ini && \ + sed -ri -e 's/^display_startup_errors =.*/display_startup_errors = On/g' /etc/php/8.4/fpm/php.ini RUN echo "" > /app/rompr/phpinfo.php -RUN update-rc.d php8.2-fpm defaults +RUN update-rc.d php8.4-fpm defaults ADD files/run-httpd /usr/local/bin/ RUN chmod 755 /usr/local/bin/run-httpd EXPOSE 80 diff --git a/apps/rompr/files/nginx_default b/apps/rompr/files/nginx_default index d2b1802..8969601 100644 --- a/apps/rompr/files/nginx_default +++ b/apps/rompr/files/nginx_default @@ -20,7 +20,7 @@ server { index index.php; location ~ \.php { try_files $uri index.php =404; - fastcgi_pass unix:/run/php/php8.2-fpm.sock; + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $request_filename; include /etc/nginx/fastcgi_params; diff --git a/apps/rompr/files/run-httpd b/apps/rompr/files/run-httpd index 3dd7b1f..b1986b8 100644 --- a/apps/rompr/files/run-httpd +++ b/apps/rompr/files/run-httpd @@ -4,5 +4,5 @@ mkdir -p /var/log/nginx set -e mkdir -p /rompr/albumart /rompr/prefs chown www-data:www-data -R /rompr/albumart /rompr/prefs -/etc/init.d/php8.2-fpm restart +/etc/init.d/php8.4-fpm restart exec /usr/sbin/nginx -g 'daemon off;'