Merge pull request #4 from milejko/feature/automatic-templating

Feature/automatic templating

Author: milejko

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         php-version: ['8.3', '8.2', '8.1', '8.0', '7.4']
         variant: ['fpm', 'cli']
-      fail-fast: true
+      fail-fast: false
     runs-on: ubuntu-latest
     steps:
     - 

.github/workflows/test-image.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+docker run -e UPLOAD_MAX_FILESIZE=200M ${IMAGE_TAG} -r 'phpinfo();' | grep "upload_max_filesize => 200M"
+docker run -e POST_MAX_SIZE=200M ${IMAGE_TAG} -r 'phpinfo();' | grep "post_max_size => 200M"
+docker run -e OPCACHE_MEMORY_CONSUMPTION=200M ${IMAGE_TAG} -r 'phpinfo();' | grep "opcache.memory_consumption => 200M"
+
 docker run ${IMAGE_TAG} -m | grep "bcmath"
 docker run ${IMAGE_TAG} -m | grep "calendar"
 docker run ${IMAGE_TAG} -m | grep "Core"
@@ -47,7 +51,4 @@ docker run ${IMAGE_TAG} -m | grep "zlib"
 docker run ${IMAGE_TAG} -a | grep "Interactive"
 
 docker run ${IMAGE_TAG} composer -V | grep "Composer version"
-
-docker run -e UPLOAD_MAX_FILESIZE=200M ${IMAGE_TAG} -r 'phpinfo();' | grep "upload_max_filesize => 200M"
-docker run -e POST_MAX_SIZE=200M ${IMAGE_TAG} -r 'phpinfo();' | grep "post_max_size => 200M"
-docker run -e OPCACHE_MEMORY_CONSUMPTION=200M ${IMAGE_TAG} -r 'phpinfo();' | grep "opcache.memory_consumption => 200M"
+docker run ${IMAGE_TAG} pwd | grep "/app"

Dockerfile

@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1.6
 
-ARG DEBIAN_VERSION=bookworm-slim
+ARG OS_VERSION=bookworm-slim
 
 ## PHP-CLI stage
-FROM debian:${DEBIAN_VERSION} as php-cli
+FROM debian:${OS_VERSION} as php-cli
 
 ARG PHP_VERSION=8.2
 
@@ -24,7 +24,6 @@ ENV APP_DIR=/app \
 
 RUN apt-get update && \
 	apt-get install -yq --no-install-recommends \
-		gettext-base \
 		lsb-release \
 		wget \
 		ca-certificates \
@@ -50,7 +49,8 @@ RUN apt-get update && \
 # https://github.com/php/php-src/blob/17baa87faddc2550def3ae7314236826bc1b1398/sapi/fpm/php-fpm.8.in#L163
 STOPSIGNAL SIGQUIT
 
-COPY --link ./etc/php /etc/php
+COPY --link ./etc/php/cli /etc/php/${PHP_VERSION}/cli
+COPY --link ./etc/php/mods-available /etc/php/${PHP_VERSION}/mods-available
 COPY --link --chmod=755 ./docker-entrypoint.d /docker-entrypoint.d
 COPY --link --chmod=755 ./docker-entrypoint /docker-entrypoint
 
@@ -77,6 +77,8 @@ RUN apt-get install -yq --no-install-recommends \
 	php${PHP_VERSION}-fpm && \
 	ln -s /usr/sbin/php-fpm${PHP_VERSION} /usr/bin/php-fpm
 
+COPY --link ./etc/php/fpm /etc/php/${PHP_VERSION}/fpm
+
 EXPOSE ${FPM_LISTEN_PORT}
 
 CMD [ "/usr/bin/php-fpm" ]

README.html

@@ -1,7 +1,7 @@
 <h1>PHP Docker image, extendable with APT packages</h1>
 <p>
     Debian-slim based, open source, Docker image with ease of configuration in the heart.<br>
-    Dockerfile can be found here: <a target="blank"
+    The Dockerfile can be found here: <a target="blank"
     href="https://github.com/milejko/php/blob/main/Dockerfile">https://github.com/milejko/php</a>.<br>
     <br>
     Supported versions: 7.4, 8.0, 8.1, 8.2, 8.3-RC<br>
@@ -12,6 +12,9 @@ <h2>Core features</h2>
     <li>
         A clean way of configuring: by passing ENVs during the runtime/orchestration (<a href="#env">ie. MEMORY_LIMIT, list below</a>)
     </li>
+    <li>
+        Easily customizable entrypoint - implemented "/docker-entrypoint.d/" directory
+    </li>
     <li>
         PHP and <a href="#modules">default modules</a> are installed from <a target="_blank" href="https://deb.sury.org">DEB packages</a>
     </li>

docker-entrypoint.d/.placeholder

@@ -0,0 +1,5 @@
+[PHP]
+memory_limit        = ${MEMORY_LIMIT}
+max_execution_time  = ${MAX_EXECUTION_TIME}
+upload_max_filesize = ${UPLOAD_MAX_FILESIZE}
+post_max_size       = ${POST_MAX_SIZE}