Merge pull request #152 from lastsamurai26/main

Add serval changes

Author: JulianPrieber

Dockerfile

@@ -9,39 +9,39 @@ RUN apk --no-cache --update \
     add apache2 \
     apache2-ssl \
     curl \
-    php82-apache2 \
-    php82-bcmath \
-    php82-bz2 \
-    php82-calendar \
-    php82-common \
-    php82-ctype \
-    php82-curl \
-    php82-dom \
-    php82-fileinfo \
-    php82-gd \
-    php82-iconv \
-    php82-json \
-    php82-mbstring \
-    php82-mysqli \
-    php82-mysqlnd \
-    php82-openssl \
-    php82-pdo_mysql \
-    php82-pdo_pgsql \
-    php82-pdo_sqlite \
-    php82-phar \
-    php82-session \
-    php82-xml \
-    php82-tokenizer \
-    php82-zip \
-    php82-xmlwriter \
-    php82-redis \
+    php83-apache2 \
+    php83-bcmath \
+    php83-bz2 \
+    php83-calendar \
+    php83-common \
+    php83-ctype \
+    php83-curl \
+    php83-dom \
+    php83-fileinfo \
+    php83-gd \
+    php83-iconv \
+    php83-json \
+    php83-mbstring \
+    php83-mysqli \
+    php83-mysqlnd \
+    php83-openssl \
+    php83-pdo_mysql \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-phar \
+    php83-session \
+    php83-xml \
+    php83-tokenizer \
+    php83-zip \
+    php83-xmlwriter \
+    php83-redis \
     tzdata \
     && mkdir /htdocs
 
 COPY linkstack /htdocs
 COPY configs/apache2/httpd.conf /etc/apache2/httpd.conf
 COPY configs/apache2/ssl.conf /etc/apache2/conf.d/ssl.conf
-COPY configs/php/php.ini /etc/php8.2/php.ini
+COPY configs/php/php.ini /etc/php83/conf.d/40-custom.ini
 
 RUN chown apache:apache /etc/ssl/apache2/server.pem
 RUN chown apache:apache /etc/ssl/apache2/server.key
@@ -52,6 +52,10 @@ RUN find /htdocs -type f -print0 | xargs -0 chmod 0644
 
 COPY --chmod=0755 docker-entrypoint.sh /usr/local/bin/
 
+RUN chmod -R 755 /etc/php83 && \
+    chown -R apache:apache /etc/php83
+
+
 USER apache:apache
 
 HEALTHCHECK CMD curl -f http://localhost -A "HealthCheck" || exit 1

docker-entrypoint.sh

@@ -30,14 +30,30 @@ printf '|                      LINKSTACK v%s%*s|\n' "${v}" "$vlen" | tr ' ' " "
 # + ---------------- + #
 
 echo '+ ------------------------------------------------------------------ +'
+echo '| Updating Configuration: Apache Base (/etc/apache2/httpd.conf)      |'
+echo '| Updating Configuration: Apache SSL  (/etc/apache2/conf.d/ssl.conf) |'
+
+# + ------------- + #
+# | -- PHP.INI -- | #
+# + ------------- + #
+
+echo '| Updating Configuration: PHP         (/etc/php83/40-custom.ini)     |'
+echo "| Setting PHP Configuration:                                         |"
+echo "| upload_max_filesize = ${UPLOAD_MAX_FILESIZE}                       |"
+echo "| memory_limit = ${PHP_MEMORY_LIMIT}                                 |"
+echo "| date.timezone = ${TZ}                                              |"
+
+echo "upload_max_filesize = ${UPLOAD_MAX_FILESIZE}" >> /etc/php83/conf.d/40-custom.ini
+echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /etc/php83/conf.d/40-custom.ini
+echo "date.timezone = ${TZ}" >> /etc/php83/conf.d/40-custom.ini
 
 # + ---------- + #
 # | -- MISC -- | #
 # + ---------- + #
 
 # Apache gets grumpy about PID files pre-existing
 rm -f /htdocs/httpd.pid
-
+echo '| Updating Configuration: Complete                                   |'
 echo '| ------------------------------------------------------------------ |'
 echo '| Running Apache                                                     |'
 echo '+ ------------------------------------------------------------------ +'