Updated build config

.github/workflows/production.yml

@@ -46,17 +46,16 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - id: config
-        run: |
-          echo "::set-output name=s6_version::$(cat S6_VERSION.txt)"
-          echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
-      - run: |
+      - id: config
+        run: |
           ./.git-config/hooks/pre-commit
           mkdir -p /tmp/buildx
           cat versions/base.txt
+          echo "::set-output name=s6_version::$(cat S6_VERSION.txt)"
+          echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/cache@v2
         with:
           path: /tmp/buildx
@@ -74,7 +73,7 @@ jobs:
           cache-from: type=local,src=/tmp/buildx
           cache-to: type=local,dest=/tmp/buildx-new,mode=max
           context: "{{defaultContext}}:src/base/"
-          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
             BUILD_NUMBER=${{ steps.config.outputs.date }}-${{ hashFiles('versions/base.txt') }}
             BASE_IMAGE=${{ matrix.base }}:${{ matrix.version }}
@@ -105,16 +104,16 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - id: config
-        run: echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
-      - run: |
+      - id: config
+        run: |
           ./.git-config/hooks/pre-commit
           mkdir -p /tmp/buildx
           cat versions/cli.txt
           cat versions/fpm.txt
+          echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/cache@v2
         with:
           path: /tmp/buildx
@@ -132,7 +131,7 @@ jobs:
           cache-from: type=local,src=/tmp/buildx
           cache-to: type=local,dest=/tmp/buildx,mode=max
           context: "{{defaultContext}}:src/php/cli/"
-          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
             BUILD_NUMBER=${{ steps.config.outputs.date }}-${{ hashFiles('versions/cli.txt') }}
             BASE_IMAGE=shinsenter/s6-ubuntu:focal
@@ -149,7 +148,7 @@ jobs:
           cache-from: type=local,src=/tmp/buildx
           cache-to: type=local,dest=/tmp/buildx-new,mode=max
           context: "{{defaultContext}}:src/php/fpm/"
-          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
             BUILD_NUMBER=${{ steps.config.outputs.date }}-${{ hashFiles('versions/fpm.txt') }}
             BASE_IMAGE=${{ matrix.image }}
@@ -183,15 +182,15 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - id: config
-        run: echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
-      - run: |
+      - id: config
+        run: |
           ./.git-config/hooks/pre-commit
           mkdir -p /tmp/buildx
           cat versions/servers.txt
+          echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/cache@v2
         with:
           path: /tmp/buildx
@@ -209,7 +208,7 @@ jobs:
           cache-from: type=local,src=/tmp/buildx
           cache-to: type=local,dest=/tmp/buildx-new,mode=max
           context: "{{defaultContext}}:src/servers/${{ matrix.variation }}/"
-          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
             BUILD_NUMBER=${{ steps.config.outputs.date }}-${{ hashFiles('versions/servers.txt') }}
             BASE_IMAGE=${{ matrix.image }}
@@ -244,15 +243,15 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - id: config
-        run: echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
-      - run: |
+      - id: config
+        run: |
           ./.git-config/hooks/pre-commit
           mkdir -p /tmp/buildx
           cat versions/webapps.txt
+          echo "::set-output name=date::$(date +'%Y%m%d')"
       - uses: actions/cache@v2
         with:
           path: /tmp/buildx
@@ -270,7 +269,7 @@ jobs:
           cache-from: type=local,src=/tmp/buildx
           cache-to: type=local,dest=/tmp/buildx-new,mode=max
           context: "{{defaultContext}}:src/webapps/${{ matrix.app }}/"
-          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
             BUILD_NUMBER=${{ steps.config.outputs.date }}-${{ hashFiles('versions/webapps.txt') }}
             BASE_IMAGE=shinsenter/php

src/base/Dockerfile

@@ -108,5 +108,5 @@ ENV S6_SERVICES_GRACETIME=3000
 
 ARG   BUILD_NUMBER
 LABEL build_number="$BUILD_NUMBER"
-LABEL publisher="https://hub.docker.com/u/shinsenter"
 LABEL maintainer="[email protected]"
+LABEL publisher="https://hub.docker.com/u/shinsenter"

src/base/root/etc/cont-init.d/000-update-webuser

@@ -14,6 +14,6 @@ if [[ $PUID != 9999 || $PGID != 9999 ]]; then
     /usr/sbin/usermod  -o -u $PUID webuser
 fi
 
-if [ ! -z "$WEBHOME" ] && [ ! -e "$WEBHOME" ]; then
+if [ ! -z "$WEBHOME" ]; then
     webuser-mkdir $WEBHOME
 fi

src/base/root/etc/cont-init.d/999-fix-permission

@@ -3,9 +3,11 @@
 WEBHOME="${WEBHOME:-/var/www/html}"
 
 if [ "$FIX_WEBHOME_PERMISSION" == "true" ] || [ -e /tmp/cleanup ]; then
-    echo
-    echo "🗂 Fixing permission for ${WEBHOME}..."
-    webuser-mkdir $WEBHOME recursive
+    if [ ! -z "$WEBHOME" ]; then
+        echo
+        echo "🗂 Fixing permission for ${WEBHOME}..."
+        webuser-mkdir $WEBHOME recursive
+    fi
     rm -f /tmp/cleanup
 fi
 

src/php/fpm/root/etc/services.d/100-php-fpm/run → src/php/fpm/root/etc/services.d/200-php-fpm/run

@@ -2,7 +2,13 @@
 
 WEBHOME="${WEBHOME:-/var/www/html}"
 
+echo
+/usr/sbin/php-fpm -v
+
+su webuser
+
 if [ -f $WEBHOME/composer.json ] && [ ! -e $WEBHOME/vendor/ ]; then
+    echo
     echo "🤖 Installing packages from $WEBHOME/composer.json..."
     dirty
     /usr/bin/composer install -d $WEBHOME/ \
@@ -13,8 +19,4 @@ if [ -f $WEBHOME/composer.json ] && [ ! -e $WEBHOME/vendor/ ]; then
 fi
 
 echo
-/usr/sbin/php-fpm -v
-
-echo
-su webuser
 /usr/sbin/php-fpm --nodaemonize

src/servers/fpm-apache/Dockerfile

@@ -13,8 +13,10 @@ ARG APACHE_PPA_KEY="4F4EA0AAE5267A6C"
 ARG APACHE_PPA_URL="http://ppa.launchpadcontent.net/ondrej/apache2/ubuntu"
 ARG APACHE_SOURCES="/etc/apt/sources.list.d/ondrej-apache.list"
 
-ARG APACHE_RUN_GROUP=webgroup
-ARG APACHE_RUN_USER=webuser
+ARG APACHE_RUN_GROUP="webgroup"
+ARG APACHE_RUN_USER="webuser"
+ENV WEBHOME="/var/www/html"
+ENV APACHE_DOCUMENT_ROOT=""
 
 RUN echo "Installing Apache..." \
     \
@@ -29,6 +31,7 @@ RUN echo "Installing Apache..." \
     && echo "ServerName localhost" >>/etc/apache2/apache2.conf \
     && sed -i 's/LogFormat "%h %l %u %t \\\"%r\\\" %>s %O \\\"/LogFormat "%a %l %u %t \\\"%r\\\" %>s %O \\\"/' /etc/apache2/apache2.conf \
     && echo >>/etc/apache2/envvars \
+    && echo "export DOCUMENT_ROOT=\"${WEBHOME}\${APACHE_DOCUMENT_ROOT}\"" >>/etc/apache2/envvars \
     && echo "export APACHE_RUN_USER=${APACHE_RUN_USER}" >>/etc/apache2/envvars \
     && echo "export APACHE_RUN_GROUP=${APACHE_RUN_GROUP}" >>/etc/apache2/envvars \
     && rm -f ${WEBHOME}/*.html \

src/servers/fpm-apache/root/etc/apache2/sites-available/000-default.conf

@@ -7,7 +7,7 @@
     RemoteIPHeader CF-Connecting-IP
 
    # Configure main document root
-    DocumentRoot ${WEBHOME}${APACHE_DOCUMENT_ROOT}
+    DocumentRoot ${DOCUMENT_ROOT}
 
     # Set basic settings for document root. Configure correct directory indexes and disable directory browsing
     <Directory ${WEBHOME}>
@@ -47,7 +47,7 @@
     Protocols h2 http/1.1
 
     # Configure main document root
-    DocumentRoot ${WEBHOME}${APACHE_DOCUMENT_ROOT}
+    DocumentRoot ${DOCUMENT_ROOT}
 
     # Set basic settings for document root.
     # Configure correct directory indexes and disable directory browsing

src/servers/fpm-nginx/Dockerfile

@@ -13,6 +13,9 @@ ARG NGINX_PPA_KEY="4F4EA0AAE5267A6C"
 ARG NGINX_PPA_URL="http://ppa.launchpadcontent.net/ondrej/nginx-mainline/ubuntu"
 ARG NGINX_SOURCES="/etc/apt/sources.list.d/ondrej-nginx.list"
 
+ENV WEBHOME="/var/www/html"
+ENV NGINX_DOCUMENT_ROOT=""
+
 RUN echo "Installing Nginx..." \
     \
     # adds ondrej repos for Nginx

src/webapps/codeigniter4/Dockerfile

@@ -13,11 +13,11 @@ FROM ${BASE_IMAGE}:${PHP_VERSION}-fpm-apache
 ADD root/ /
 
 # updates document root path
-ENV WEBHOME=/var/www/html
-ENV APACHE_DOCUMENT_ROOT=/public
+ENV WEBHOME="/var/www/html"
+ENV APACHE_DOCUMENT_ROOT="/public"
 
 # sets the working directory
-WORKDIR /var/www/html/
+WORKDIR $WEBHOME
 
 ################################################################################
 

src/webapps/laravel/Dockerfile

@@ -17,11 +17,11 @@ RUN apt-update && apt-install php${PHP_VERSION}-swoole \
 ADD root/ /
 
 # updates document root path
-ENV WEBHOME=/var/www/html
-ENV NGINX_DOCUMENT_ROOT=/public
+ENV WEBHOME="/var/www/html"
+ENV NGINX_DOCUMENT_ROOT="/public"
 
 # sets the working directory
-WORKDIR /var/www/html/
+WORKDIR $WEBHOME
 
 ################################################################################
 

src/webapps/phpmyadmin/Dockerfile

@@ -13,8 +13,8 @@ FROM ${BASE_IMAGE}:${PHP_VERSION}-fpm-nginx
 ADD root/ /
 
 # updates document root path
-ENV WEBHOME=/var/www/html
-ENV NGINX_DOCUMENT_ROOT=
+ENV WEBHOME="/var/www/html"
+ENV NGINX_DOCUMENT_ROOT=""
 
 # sets the working directory
 WORKDIR $WEBHOME

src/webapps/symfony/Dockerfile

@@ -13,11 +13,11 @@ FROM ${BASE_IMAGE}:${PHP_VERSION}-fpm-nginx
 ADD root/ /
 
 # updates document root path
-ENV WEBHOME=/var/www/html
-ENV NGINX_DOCUMENT_ROOT=/public
+ENV WEBHOME="/var/www/html"
+ENV NGINX_DOCUMENT_ROOT="/public"
 
 # sets the working directory
-WORKDIR /var/www/html/
+WORKDIR $WEBHOME
 
 ################################################################################
 

src/webapps/wordpress/Dockerfile

@@ -27,8 +27,8 @@ COPY --from=source /usr/bin/wp-cli /usr/bin/wp-cli
 ADD  root/ /
 
 # updates document root path
-ENV WEBHOME=/var/www/html
-ENV APACHE_DOCUMENT_ROOT=
+ENV WEBHOME="/var/www/html"
+ENV APACHE_DOCUMENT_ROOT=""
 
 # sets the working directory
 WORKDIR $WEBHOME

tests/common.yml

@@ -4,7 +4,7 @@ services:
   ##############################################################################
 
   common:
-    platform: ${BUILD_PLATFORM:-linux/arm/v6}
+    platform: ${BUILD_PLATFORM:-linux/arm64/v8}
     environment:
       - PUID=1234
       - PGID=1234

tests/test.sh

@@ -5,7 +5,7 @@ TEST_DIR="$BASE_DIR/tests"
 export DOCKER_BUILDKIT=1
 export S6_VERSION="$(cat $BASE_DIR/S6_VERSION.txt)"
 export PHP_VERSION="${1:-8.1}"
-export BUILD_PLATFORM="${2:-linux/arm/v6}"
+export BUILD_PLATFORM="${2:-linux/arm64/v8}"
 
 clear
 $BASE_DIR/.git-config/hooks/pre-commit