From 25147cdc2b5ee09a94ff295ab863de70390ee43b Mon Sep 17 00:00:00 2001
From: Luca IU2FRL <iu2frl.mn@gmail.com>
Date: Mon, 28 Aug 2023 19:41:25 +0200
Subject: [PATCH] Moving to PHP8.2

---
 docker/Dockerfile | 12 ++++++------
 install/index.php |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 725bc2c6..da2bfd74 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,24 +1,24 @@
-FROM php:7.4-apache                                                                                                                                         
+FROM php:8.2-apache             
+# Enabling custom upload settings in PHP                                                                                                                            
 RUN touch /usr/local/etc/php/conf.d/uploads.ini \                                                                                                           
 && echo "file_uploads = On" >> /usr/local/etc/php/conf.d/uploads.ini \
 && echo "memory_limit = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \
 && echo "upload_max_filesize = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \
 && echo "post_max_size = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \
 && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/uploads.ini
+# Adding required libraries and modules
 RUN apt-get update \
 && apt-get install -y git curl libxml2-dev libonig-dev
 RUN docker-php-ext-install mysqli mbstring xml
-#RUN docker-php-ext-install curl
-#RUN docker-php-ext-install openssl
+# Cleanup
 RUN rm -rf /var/www/html/docker/
+# Copy proper file to target image
 COPY ./ /var/www/html/
 WORKDIR /var/www/html
 # Setting permissions as: https://github.com/magicbug/Cloudlog/wiki/Installation
 RUN cd /var/www/html \
-&& echo "Setting root as owner of the html folder" \
 && chown -R root:www-data /var/www/html
-RUN echo "Setting permissions to the install folder" \
-&& chmod -R g+rw ./application/config/ \
+RUN chmod -R g+rw ./application/config/ \
 && chmod -R g+rw ./application/logs/ \
 && chmod -R g+rw ./assets/qslcard/ \
 && chmod -R g+rw ./backup/ \
diff --git a/install/index.php b/install/index.php
index 1e65398d..9524e520 100644
--- a/install/index.php
+++ b/install/index.php
@@ -19,9 +19,9 @@ function delDir($dir) {
 		}
     }
 	// This step may be not needed
-    if (file_exists($dir)) {
-		rmdir( $dir );
-	}
+    // if (file_exists($dir)) {
+	// 	rmdir( $dir );
+	// }
 }
 
 if (file_exists($db_file_path)) {