changes

Tob1as · Tob1as · commit 64200fb84305 · 2025-12-26T23:40:58.000+01:00
diff --git a/README.md b/README.md
@@ -36,11 +36,12 @@ PHP is a server-side scripting language designed for web development, but which
 
 * Environment Variables:  
   * `TZ` (set timezone, example: "Europe/Berlin")
-  * `PHP_ERRORS` (set 1 to enable)
-  * `PHP_MEM_LIMIT` (set Value in MB, example: 128)
-  * `PHP_POST_MAX_SIZE` (set Value in MB, example: 250)
-  * `PHP_UPLOAD_MAX_FILESIZE` (set Value in MB, example: 250)
-  * `PHP_MAX_FILE_UPLOADS` (set number, example: 20)
+  * `PHP_ERRORS` (set 1 to enable, default: disabled)
+  * `PHP_MEM_LIMIT` (set Value in MB, example: 256, default: 128)
+  * `PHP_POST_MAX_SIZE` (set Value in MB, example: 250, default: 8)
+  * `PHP_UPLOAD_MAX_FILESIZE` (set Value in MB, example: 240, default: 2)
+  * `PHP_MAX_FILE_UPLOADS` (set number, example: 25, default: 20)
+  * `PHP_MAX_EXECUTION_TIME` (set Value in Seconds, example: 120, default: 30)
   * `CREATE_PHPINFO_FILE` (set 1 to enable, for dev and testing)
   * `CREATE_INDEX_FILE` (set 1 to enable, for dev and testing)
   * PHP-FPM (only):
diff --git a/alpine.fpm.Dockerfile b/alpine.fpm.Dockerfile
@@ -2,11 +2,16 @@ ARG PHP_VERSION=8.4
 FROM tobi312/php:${PHP_VERSION}-fpm-alpine-slim
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 SHELL ["/bin/sh", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP-FPM" \
 	org.opencontainers.image.description="Alpine with PHP-FPM ${PHP_VERSION}" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/alpine.fpm.slim.Dockerfile b/alpine.fpm.slim.Dockerfile
@@ -2,11 +2,16 @@ ARG PHP_VERSION=8.4
 FROM php:${PHP_VERSION}-fpm-alpine
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 SHELL ["/bin/sh", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP-FPM" \
 	org.opencontainers.image.description="Alpine with PHP-FPM ${PHP_VERSION}" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/alpine.fpm_nginx.Dockerfile b/alpine.fpm_nginx.Dockerfile
@@ -2,11 +2,16 @@ ARG PHP_VERSION=8.4
 FROM tobi312/php:${PHP_VERSION}-fpm-nginx-alpine-slim
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 SHELL ["/bin/sh", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP-FPM+NGINX" \
 	org.opencontainers.image.description="Alpine with PHP-FPM ${PHP_VERSION} and NGINX" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/alpine.fpm_nginx.extended.Dockerfile b/alpine.fpm_nginx.extended.Dockerfile
@@ -2,6 +2,9 @@ ARG PHP_VERSION=8.4
 FROM tobi312/php:${PHP_VERSION}-fpm-nginx-alpine
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 ## example build command: docker build -t tobi312/php:8.1-fpm-nginx-alpine-extended --build-arg PHP_VERSION=8.4 -f alpine.fpm_nginx.extended.Dockerfile .
 
 # set environment variable
diff --git a/alpine.fpm_nginx.extended.git.Dockerfile b/alpine.fpm_nginx.extended.git.Dockerfile
@@ -28,6 +28,9 @@ FROM tobi312/php:${PHP_VERSION}-fpm-nginx-alpine
 ARG PHP_VERSION
 ARG ARCH
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 # set environment variable
 ENV ENABLE_NGINX_STATUS=1 \
     ENABLE_PHP_FPM_STATUS=1 \
diff --git a/alpine.fpm_nginx.slim.Dockerfile b/alpine.fpm_nginx.slim.Dockerfile
@@ -2,11 +2,16 @@ ARG PHP_VERSION=8.4
 FROM php:${PHP_VERSION}-fpm-alpine
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 SHELL ["/bin/sh", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP-FPM+NGINX" \
 	org.opencontainers.image.description="Alpine with PHP-FPM ${PHP_VERSION} and NGINX" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/conf/php_70-opcache.ini b/conf/php_70-opcache.ini
@@ -0,0 +1,34 @@
+; https://www.php.net/manual/en/opcache.configuration.php
+
+[opcache]
+; Determines if Zend OPCache is enabled (default: 1)
+opcache.enable=1
+
+; Determines if Zend OPCache is enabled for the CLI version of PHP (default: 0)
+opcache.enable_cli=0
+
+; The OPcache shared memory storage size. (default: 128)
+opcache.memory_consumption=192
+
+; The amount of memory for interned strings in Mbytes. (default: 8)
+opcache.interned_strings_buffer=16
+
+; The maximum number of keys (scripts) in the OPcache hash table.
+; Only numbers between 200 and 1000000 are allowed. (default: 10000)
+opcache.max_accelerated_files=10000
+
+; The maximum percentage of "wasted" memory until a restart is scheduled. (default: 5)
+opcache.max_wasted_percentage=10
+
+; When disabled, you must reset the OPcache manually or restart the
+; webserver for changes to the filesystem to take effect. (default: 1)
+opcache.validate_timestamps=1
+
+; How often (in seconds) to check file timestamps for changes to the shared
+; memory storage allocation. ("1" means validate once per second, but only
+; once per request. "0" means always validate) (default: 2)
+opcache.revalidate_freq=2
+
+; If disabled, all PHPDoc comments are dropped from the code to reduce the
+; size of the optimized code. (default: 1)
+opcache.save_comments=1
diff --git a/debian.apache.Dockerfile b/debian.apache.Dockerfile
@@ -2,13 +2,18 @@ ARG PHP_VERSION=8.4
 FROM tobi312/php:${PHP_VERSION}-apache-slim
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 ARG DEBIAN_FRONTEND=noninteractive
 
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP+Apache2" \
 	org.opencontainers.image.description="Debian with PHP ${PHP_VERSION} and Apache2" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/debian.apache.slim.Dockerfile b/debian.apache.slim.Dockerfile
@@ -2,13 +2,18 @@ ARG PHP_VERSION=8.4
 FROM php:${PHP_VERSION}-apache
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 ARG DEBIAN_FRONTEND=noninteractive
 
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP+Apache2" \
 	org.opencontainers.image.description="Debian with PHP ${PHP_VERSION} and Apache2" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/debian.apache.wsc.Dockerfile b/debian.apache.wsc.Dockerfile
@@ -0,0 +1,58 @@
+# build: docker build --no-cache --progress=plain --build-arg PHP_VERSION=8.4 -t tobi312/php:8.4-apache-wsc -f debian.apache.wsc.Dockerfile .
+ARG PHP_VERSION=8.4
+FROM tobi312/php:${PHP_VERSION}-apache-slim
+ARG PHP_VERSION
+
+ARG VCS_REF
+ARG BUILD_DATE
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
+
+LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
+	org.opencontainers.image.title="PHP+Apache2 for WSC" \
+	org.opencontainers.image.description="Debian with PHP ${PHP_VERSION} and Apache2 for WSC (WoltLab Suite Core)" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
+	org.opencontainers.image.licenses="MIT" \
+	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
+	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
+
+# WSC = WoltLab Suite Core <https://www.woltlab.com/en/>
+# PHP Extensions Requirements:
+# - https://manual.woltlab.com/en/requirements/#php-extensions
+# - https://manual.woltlab.com/en/elasticsearch/#system-requirements
+# - https://manual.woltlab.com/en/ldap/#system-requirements
+# Note: Some PHP Extensions/Modules are installed by default, so these have been commented out.
+
+# PHP
+RUN \
+	PHP_EXTENSIONS_LIST_BASE=" \
+	#	ctype \
+	#	curl \
+	#	dom \
+		exif \
+		gd \
+		gmp \
+		imagick \
+		intl \
+	#	libxml \
+	#	mbstring \
+	#	openssl \
+	##  PDO \
+		pdo_mysql \
+	#	zlib \
+ 	" ; \
+	PHP_EXTENSIONS_LIST_OPTIONAL=" \
+	#	opcache \
+	#	curl \
+		ldap \
+	" ; \
+	PHP_EXTENSIONS_LIST="$PHP_EXTENSIONS_LIST_BASE $PHP_EXTENSIONS_LIST_OPTIONAL" ; \
+    \
+    install-php-extensions $PHP_EXTENSIONS_LIST ; \
+    php -m
+
+# opcache config
+COPY conf/php_70-opcache.ini /usr/local/etc/php/conf.d/70-opcache.ini
diff --git a/debian.fpm.Dockerfile b/debian.fpm.Dockerfile
@@ -2,13 +2,18 @@ ARG PHP_VERSION=8.4
 FROM tobi312/php:${PHP_VERSION}-fpm-slim
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 ARG DEBIAN_FRONTEND=noninteractive
 
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP+FPM" \
 	org.opencontainers.image.description="Debian with PHP ${PHP_VERSION} with FPM" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/debian.fpm.slim.Dockerfile b/debian.fpm.slim.Dockerfile
@@ -2,13 +2,18 @@ ARG PHP_VERSION=8.4
 FROM php:${PHP_VERSION}-fpm
 ARG PHP_VERSION
 
+ARG VCS_REF
+ARG BUILD_DATE
+
 ARG DEBIAN_FRONTEND=noninteractive
 
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
 
 LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 	org.opencontainers.image.title="PHP-FPM" \
 	org.opencontainers.image.description="Debian with PHP ${PHP_VERSION} with FPM" \
+	org.opencontainers.image.created="${BUILD_DATE}" \
+	org.opencontainers.image.revision="${VCS_REF}" \
 	org.opencontainers.image.licenses="MIT" \
 	org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
 	org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -115,6 +115,12 @@ if [ -n "$PHP_MAX_FILE_UPLOADS" ]; then
 	echo "max_file_uploads = ${PHP_MAX_FILE_UPLOADS}" >> /usr/local/etc/php/conf.d/${PHP_INI_FILE_NAME}
 fi
 
+## changes the max_execution_time
+if [ -n "$PHP_MAX_EXECUTION_TIME" ]; then
+	echo ">> set max_execution_time"
+	echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /usr/local/etc/php/conf.d/${PHP_INI_FILE_NAME}
+fi
+
 ####################################################
 ##################### PHP-FPM ######################
 ####################################################
