From 2750a790243c007c48f46d0ed4f357ba9d4de76f Mon Sep 17 00:00:00 2001
From: Revvy <nothingtohide@revvy.de>
Date: Thu, 15 Feb 2024 20:56:13 -0500
Subject: [PATCH] Base image directly on Alpine 3.19, Update to PHP 8.3

---
 Dockerfile | 22 +++++++++++-----------
 nginx.conf |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9b888c9..2e2c804 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,17 @@
-FROM nginx:mainline-alpine-slim
+FROM alpine:3.19
 
-RUN apk add php82 php82-fpm php82-dom php82-curl php82-json php82-openssl --no-cache
-RUN sed -i 's/user  nginx;/user  nobody;/' /etc/nginx/nginx.conf \
-    && sed -i 's/listen = 127.0.0.1:9000/listen = \/run\/php-fpm82.sock/' /etc/php82/php-fpm.d/www.conf \
-    && sed -i 's/;listen.owner/listen.owner/' /etc/php82/php-fpm.d/www.conf \
-    && sed -i 's/;listen.group/listen.group/' /etc/php82/php-fpm.d/www.conf \
-    && sed -i 's/;listen.mode/listen.mode/' /etc/php82/php-fpm.d/www.conf \
-    && sed -i 's/;listen.allowed_clients/listen.allowed_clients/' /etc/php82/php-fpm.d/www.conf
+RUN apk add php83 php83-fpm php83-dom php83-curl php83-json php83-openssl nginx --no-cache
+RUN sed -i 's/user nginx;/user nobody;/' /etc/nginx/nginx.conf \
+    && sed -i 's/listen = 127.0.0.1:9000/listen = \/run\/php-fpm83.sock/' /etc/php83/php-fpm.d/www.conf \
+    && sed -i 's/;listen.owner/listen.owner/' /etc/php83/php-fpm.d/www.conf \
+    && sed -i 's/;listen.group/listen.group/' /etc/php83/php-fpm.d/www.conf \
+    && sed -i 's/;listen.mode/listen.mode/' /etc/php83/php-fpm.d/www.conf \
+    && sed -i 's/;listen.allowed_clients/listen.allowed_clients/' /etc/php83/php-fpm.d/www.conf
 
 RUN mkdir -p /var/www/binternet
 COPY . /var/www/binternet
-COPY nginx.conf /etc/nginx/conf.d/binternet.conf
-RUN rm /var/www/binternet/nginx.conf /etc/nginx/conf.d/default.conf
+COPY nginx.conf /etc/nginx/http.d/binternet.conf
+RUN rm /var/www/binternet/nginx.conf /etc/nginx/http.d/default.conf
 
 EXPOSE 80
-ENTRYPOINT ["/bin/sh", "-c" , "/usr/sbin/php-fpm82 -D && /usr/sbin/nginx -c /etc/nginx/nginx.conf -g 'daemon off;'"]
+ENTRYPOINT ["/bin/sh", "-c" , "/usr/sbin/php-fpm83 -D && /usr/sbin/nginx -c /etc/nginx/nginx.conf -g 'daemon off;'"]
diff --git a/nginx.conf b/nginx.conf
index ff33aa9..c8081b7 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -6,7 +6,7 @@ server {
     index    index.php;
 
     location ~ \.php$ {
-        fastcgi_pass   unix:/run/php-fpm82.sock;
+        fastcgi_pass   unix:/run/php-fpm83.sock;
         fastcgi_index  index.php;
         fastcgi_param  PATH_INFO $path_info;
         fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;