Test build for 1.7.0

.git-config/hooks/pre-build

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+BASE_DIR="$(git rev-parse --show-toplevel)"
+BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+BUILD_DESC=
+VCS_REF="$(git rev-parse HEAD)"
+
+prebuild () {
+    local source
+    local dockerfile
+    source="$BASE_DIR/$1"
+    dockerfile=${source}/Dockerfile
+    readmefile=${source}/README.md
+
+    if [ -f $readmefile ]; then
+        echo "\n\n$(cat ${BASE_DIR}/SPONSOR.md)" >>$readmefile
+        BUILD_DESC="$(sed '3q;d' $readmefile)"
+    fi
+
+    if [ -f $dockerfile ]; then
+        echo "\n\n$(cat ${BASE_DIR}/src/Metafile)" >>$dockerfile
+    fi
+
+    echo "::set-output name=BUILD_DATE::${BUILD_DATE}"
+    echo "::set-output name=BUILD_DESC::${BUILD_DESC}"
+    echo "::set-output name=VCS_REF::${VCS_REF}"
+}
+
+mkdir -p /tmp/buildx 2>/dev/null
+prebuild $1

README.md

@@ -188,6 +188,9 @@ ENV PHP_MAX_EXECUTION_TIME="99"
 # Set the maximum amount of memory in bytes that a script is allowed to allocate
 ENV PHP_MEMORY_LIMIT="256M"
 
+# Limit the files that can be accessed by PHP to the specified directory-tree
+ENV PHP_OPEN_BASEDIR="/var/www/html"
+
 # Sets max size of post data allowed
 ENV PHP_POST_MAX_SIZE="100M"
 
@@ -248,6 +251,17 @@ ENV PHP_OPCACHE_SAVE_COMMENTS="1"
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1"
 ```
 
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.
+
 ## Thank you [@serversideup](https://github.com/serversideup)
 
 This project is inspired by the [serversideup/docker-php](https://github.com/serversideup/docker-php) project, I love it.

src/Metafile

@@ -0,0 +1,21 @@
+################################################################################
+
+ARG BUILD_DATE
+ARG BUILD_DESC
+ARG BUILD_NAME
+ARG BUILD_VERSION
+ARG VCS_REF
+
+LABEL org.label-schema.schema-version="1.0"
+LABEL org.label-schema.name="$BUILD_NAME"
+LABEL org.label-schema.build-date="$BUILD_DATE"
+LABEL org.label-schema.version="$BUILD_VERSION"
+LABEL org.label-schema.description="$BUILD_DESC"
+LABEL org.label-schema.vcs-ref="$VCS_REF"
+LABEL org.label-schema.url="https://hub.docker.com/r/$BUILD_NAME"
+LABEL org.label-schema.vcs-url="https://github.com/shinsenter/php"
+LABEL org.label-schema.vendor="SHIN Company"
+LABEL maintainer="[email protected]"
+LABEL publisher="https://hub.docker.com/u/shinsenter"
+
+################################################################################

src/base-s6/Dockerfile

@@ -60,9 +60,4 @@ FROM scratch
 COPY --from=build /usr/src/s6/ /
 ENTRYPOINT ["/init"]
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
-LABEL maintainer="[email protected]"
-LABEL publisher="https://hub.docker.com/u/shinsenter"
+################################################################################

src/base-s6/README.md

@@ -31,11 +31,13 @@ RUN ...
 
 ## Supported platforms
 
-This repository uses multi-platform images via Docker manifests. You do not need to use a platform-specific tag (although you can); Docker will automatically choose the appropriate architecture. Currently, the supported architectures are:
+This repository uses multi-platform images via Docker manifests. Currently, the supported architectures are:
 
 - linux/amd64
 - linux/arm/v7
 - linux/arm64
 - linux/ppc64le
 - linux/riscv64
 - linux/s390x
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/base-ubuntu/Dockerfile

@@ -78,7 +78,7 @@ ENV S6_SERVICES_GRACETIME=3000
 
 ################################################################################
 
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
-LABEL maintainer="[email protected]"
-LABEL publisher="https://hub.docker.com/u/shinsenter"
+LABEL category="os"
+LABEL category="base"
+
+################################################################################

src/base-ubuntu/README.md

@@ -55,3 +55,16 @@ ENV WEBHOME="/var/www/html"
 # sets the working directory
 WORKDIR $WEBHOME
 ```
+
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+- linux/riscv64
+- linux/s390x
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/php/cli/Dockerfile

@@ -57,7 +57,4 @@ ENV COMPOSER_MAX_PARALLEL_HTTP=32
 ENV PATH /composer/vendor/bin:$PATH
 ENV PHP_CONF_DIR=/etc/php/cli/conf.d
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
+################################################################################

src/php/cli/README.md

@@ -0,0 +1,16 @@
+# shinsenter/php
+
+🧭 Production-ready Docker images for PHP, support PHP CLI and many types of PHP web applications.
+
+See: https://hub.docker.com/r/shinsenter/php
+
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/php/fpm/Dockerfile

@@ -51,7 +51,7 @@ ENV PHP_ERROR_REPORTING="E_ALL & ~E_DEPRECATED & ~E_STRICT"
 ENV PHP_MAX_EXECUTION_TIME=99
 ENV PHP_MEMORY_LIMIT=256M
 ENV PHP_POST_MAX_SIZE=100M
-ENV PHP_UPLOAD_MAX_FILE_SIZE=100M
+ENV PHP_UPLOAD_MAX_FILE_SIZE=10M
 ENV PHPFPM_CONF_DIR=/etc/php/fpm/conf.d
 
 # adds PHP PM settings
@@ -72,7 +72,4 @@ ENV PHP_OPCACHE_REVALIDATE_PATH=0
 ENV PHP_OPCACHE_SAVE_COMMENTS=1
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
+################################################################################

src/php/fpm/README.md

@@ -0,0 +1,16 @@
+# shinsenter/php
+
+🧭 Production-ready Docker images for PHP, support PHP CLI and many types of PHP web applications.
+
+See: https://hub.docker.com/r/shinsenter/php
+
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/servers/fpm-apache/Dockerfile

@@ -76,7 +76,4 @@ ENV APACHE_START_SERVERS=2
 ENV APACHE_THREAD_LIMIT=64
 ENV APACHE_THREADS_PER_CHILD=25
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
+################################################################################

src/servers/fpm-apache/README.md

@@ -96,4 +96,15 @@ ENV APACHE_THREADS_PER_CHILD="25"
 
 # Please check https://hub.docker.com/r/shinsenter/php
 # for more details of PHP environment variables.
-```
+```
+
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/servers/fpm-nginx/Dockerfile

@@ -56,7 +56,4 @@ ENV DEBUG_MODE=false
 ENV MSMTP_RELAY_SERVER_HOSTNAME=mailhog
 ENV MSMTP_RELAY_SERVER_PORT=1025
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
+################################################################################

src/servers/fpm-nginx/README.md

@@ -71,4 +71,15 @@ WORKDIR $WEBHOME
 
 # Please check https://hub.docker.com/r/shinsenter/php
 # for more details of PHP environment variables.
-```
+```
+
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/webapps/codeigniter4/Dockerfile

@@ -19,7 +19,4 @@ ENV APACHE_DOCUMENT_ROOT="/public"
 # sets the working directory
 WORKDIR $WEBHOME
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
+################################################################################

src/webapps/codeigniter4/README.md

@@ -56,7 +56,6 @@ ENV PGID=9999
 
 # sets web server root path
 ENV WEBHOME="/var/www/html"
-ENV APACHE_DOCUMENT_ROOT="/public"
 
 # sets the working directory
 WORKDIR $WEBHOME
@@ -65,4 +64,18 @@ WORKDIR $WEBHOME
 
 # Please check https://hub.docker.com/r/shinsenter/php
 # for more details of PHP environment variables.
-```
+
+# Please check https://hub.docker.com/r/shinsenter/phpfpm-apache
+# for more details of Apache environment variables.
+```
+
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/webapps/laravel/Dockerfile

@@ -30,7 +30,4 @@ ENV LARAVEL_AUTO_OPTIMIZE=true
 ENV LARAVEL_LINK_STORAGE=true
 ENV LARAVEL_AUTO_MIGRATION=false
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
+################################################################################

src/webapps/laravel/README.md

@@ -53,11 +53,9 @@ ENV TZ="UTC"
 # sets GID and UID
 ENV PUID=9999
 ENV PGID=9999
-ENV WEBHOME="/var/www/html"
 
 # sets web server root path
 ENV WEBHOME="/var/www/html"
-ENV NGINX_DOCUMENT_ROOT="/public"
 
 # sets the working directory
 WORKDIR $WEBHOME
@@ -77,4 +75,18 @@ ENV LARAVEL_AUTO_MIGRATION=false
 
 # Please check https://hub.docker.com/r/shinsenter/php
 # for more details of PHP environment variables.
-```
+
+# Please check https://hub.docker.com/r/shinsenter/phpfpm-nginx
+# for more details of Nginx environment variables.
+```
+
+## Supported platforms
+
+Currently, the supported architectures are:
+
+- linux/amd64
+- linux/arm/v7
+- linux/arm64
+- linux/ppc64le
+
+You do not need to use a platform-specific tag (although you can), Docker will automatically choose the appropriate architecture.

src/webapps/phpmyadmin/Dockerfile

@@ -48,7 +48,4 @@ ENV PMA_HOST=mysql
 # ENV PMA_QUERYHISTORYDB=
 # ENV PMA_QUERYHISTORYMAX=
 
-################################################################################
-
-ARG   BUILD_NUMBER
-LABEL build_number="$BUILD_NUMBER"
+################################################################################