feat: added Dockerfile for php84 with multiarchitecture support

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
       - "8.2"
       - "8.2-s6"
       - "8.3-s6"
+      - "8.4-s6"
 
 jobs:
   build-and-push:

Dockerfile

@@ -1,83 +1,102 @@
-FROM alpine:edge
+FROM alpine:3.21
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.8.0
 # set version for s6 overlay
 ARG S6_OVERLAY_VERSION="3.1.5.0"
-ARG S6_OVERLAY_ARCH="x86_64"
-ENV UID=100 \
-    GID=101 \
-    FPM_LOG_LEVEL=warning
+# set TARTGETARCH and S6_ARCH to map the s6-overlay arch naming conventions with the docker (TARGETARCH)
+ARG TARGETARCH
+ARG S6_ARCH
 
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+ENV UID=100 \
+  GID=101 \
+  FPM_LOG_LEVEL=warning
+# Get architecture specific dockerize package
+RUN set -eux \
+  && DOCKERIZE_URL="" \
+  && if [ "${TARGETARCH}" = "arm64" ]; then \
+  DOCKERIZE_URL="https://github.com/jwilder/dockerize/releases/download/v0.8.0/dockerize-darwin-arm64-v0.8.0.tar.gz"; \
+  elif [ "${TARGETARCH}" = "amd64" ]; then \
+  DOCKERIZE_URL="https://github.com/jwilder/dockerize/releases/download/v0.8.0/dockerize-alpine-linux-amd64-v0.8.0.tar.gz"; \
+  else \
+  echo "Unsupported architecture: ${TARGETARCH}"; \
+  exit 1; \
+  fi \
+  && wget -O dockerize.tar.gz "${DOCKERIZE_URL}" \
+  && tar -C /usr/local/bin -xzvf dockerize.tar.gz  \
+  && rm dockerize.tar.gz
 
 ################## INSTALLATION STARTS ##################
 
 # Install OS Dependencies
 RUN set -ex \
   && apk add --no-cache --virtual .build-deps \
-    autoconf automake build-base python3 gmp-dev \
-    curl \
-    tar \
-    && apk add --no-cache --virtual .run-deps \
-    nodejs npm libavif \
-    && apk --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/edge/community add \
-    # PHP and extensions
-    php83 php83-bcmath php83-ctype php83-curl php83-dom php83-exif php83-fileinfo \
-    php83-fpm php83-gd php83-gmp php83-iconv php83-intl php83-mbstring \
-    php83-mysqlnd php83-mysqli php83-opcache php83-openssl php83-pcntl php83-pecl-apcu php83-pdo php83-pdo_mysql \
-    php83-phar php83-posix php83-session php83-simplexml php83-sockets php83-sqlite3 php83-tidy \
-    php83-tokenizer php83-xml php83-xmlreader php83-xmlwriter php83-zip php83-pecl-xdebug php83-pecl-redis php83-soap php83-sodium php83-pdo_sqlite php83-pdo_pgsql php83-pgsql \
-    # Other dependencies
-    mariadb-client sudo \
-    # Miscellaneous packages
-    bash ca-certificates dialog git libjpeg libpng-dev openssh-client vim wget shadow \
-    # Nginx
-    nginx \
-    # Create directories
+  autoconf automake build-base python3 gmp-dev \
+  curl \
+  tar \
+  xz \
+  && apk add --no-cache --virtual .run-deps \
+  nodejs npm \
+  # PHP and extensions
+  php84 php84-bcmath php84-ctype php84-curl php84-dom php84-exif php84-fileinfo \
+  php84-fpm php84-gd php84-gmp php84-iconv php84-intl php84-mbstring \
+  php84-mysqlnd php84-mysqli php84-opcache php84-openssl php84-pcntl php84-pecl-apcu php84-pdo php84-pdo_mysql \
+  php84-phar php84-posix php84-session php84-simplexml php84-sockets php84-sqlite3 php84-tidy \
+  php84-tokenizer php84-xml php84-xmlreader php84-xmlwriter php84-zip php84-pecl-xdebug php84-pecl-redis php84-soap php84-sodium php84-pdo_sqlite php84-pdo_pgsql php84-pgsql \
+  # Other dependencies
+  mariadb-client sudo shadow \
+  # Miscellaneous packages
+  bash ca-certificates dialog git libjpeg libpng-dev openssh-client vim wget shadow \
+  # Nginx
+  nginx \
+  # Create directories
   && mkdir -p /etc/nginx \
-    && mkdir -p /run/nginx \
-    && mkdir -p /etc/nginx/sites-available \
-    && mkdir -p /etc/nginx/sites-enabled \
-    && rm -Rf /var/www/* \
-    && rm -Rf /etc/nginx/nginx.conf \
+  && mkdir -p /run/nginx \
+  && mkdir -p /etc/nginx/sites-available \
+  && mkdir -p /etc/nginx/sites-enabled \
+  && rm -Rf /var/www/* \
+  && rm -Rf /etc/nginx/nginx.conf \
   # Composer
   && wget https://composer.github.io/installer.sig -O - -q | tr -d '\n' > installer.sig \
-    && php83 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php83 -r "if (hash_file('SHA384', 'composer-setup.php') === file_get_contents('installer.sig')) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
-    && php83 composer-setup.php --install-dir=/usr/bin --filename=composer \
-    && php83 -r "unlink('composer-setup.php'); unlink('installer.sig');" \
+  && php84 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+  && php84 -r "if (hash_file('SHA384', 'composer-setup.php') === file_get_contents('installer.sig')) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php84 composer-setup.php --install-dir=/usr/bin --filename=composer \
+  && php84 -r "unlink('composer-setup.php'); unlink('installer.sig');" \
   # Cleanup
   && apk del .build-deps
 
 ##################  INSTALLATION ENDS  ##################
 
-# add s6 overlay
-ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
-RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
-ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp
-RUN tar -C / -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz
+# add s6 overlay based on architecture
+RUN set -eux \
+  && S6_ARCH="" \
+  && if [ "${TARGETARCH}" = "amd64" ]; then S6_ARCH="x86_64"; \
+  elif [ "${TARGETARCH}" = "arm64" ]; then S6_ARCH="aarch64"; fi\
+  && if [ -z "${S6_ARCH}" ]; then { echo "Error: Not able to determine arch"; exit 1; }; fi \
+  && echo "Installing s6-overlay for ${S6_ARCH}" \
+  && wget "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" \
+  && wget "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" \
+  && tar -C / -Jxpf s6-overlay-noarch.tar.xz \
+  && tar -C / -Jxpf s6-overlay-${S6_ARCH}.tar.xz 
 
 # add s6 optional symlinks
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz
 
+
 ##################  CONFIGURATION STARTS  ##################
 
 ADD rootfs /
 
 RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf && \
-    ln -s /etc/php83/php.ini /etc/php83/conf.d/php.ini && \
-    rm -rf /usr/bin/php && \
-    ln -s /usr/bin/php83 /usr/bin/php && \
-    chown -R nginx:nginx /var/www && \
-    chmod 755 /etc/s6-overlay/s6-rc.d/*/run && \
-    chmod 755 /etc/s6-overlay/s6-rc.d/*/up && \
-    mkdir -p /var/www/storage/logs/ && \
-    touch /var/www/storage/logs/laravel.log /var/log/nginx/error.log /var/log/php83/error.log
+  ln -s /etc/php84/php.ini /etc/php84/conf.d/php.ini && \
+  ln -s /usr/bin/php84 /usr/bin/php && \
+  chown -R nginx:nginx /var/www && \
+  chmod 755 /etc/s6-overlay/s6-rc.d/*/run && \
+  chmod 755 /etc/s6-overlay/s6-rc.d/*/up && \
+  mkdir -p /var/www/storage/logs/ && \
+  touch /var/www/storage/logs/laravel.log /var/log/nginx/error.log /var/log/php84/error.log
 
 ##################  CONFIGURATION ENDS  ##################
 

rootfs/etc/php83/php-fpm.conf → rootfs/etc/php84/php-fpm.conf

@@ -21,7 +21,7 @@
 ; into a local file.
 ; Note: the default prefix is /var
 ; Default Value: log/php7/error.log
-error_log = /var/log/php83/error.log
+error_log = /var/log/php84/error.log
 
 ; syslog_facility is used to specify what type of program is logging the
 ; message. This lets syslogd specify that messages from different facilities
@@ -122,6 +122,6 @@ daemonize = no
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php83/php-fpm.d/*.conf
+include=/etc/php84/php-fpm.d/*.conf
 
 php_flag[display_errors] = {{ default .Env.PHP_DISPLAY_ERRORS "off" }}

rootfs/etc/php83/php-fpm.d/www.conf → rootfs/etc/php84/php-fpm.d/www.conf

@@ -314,7 +314,7 @@ pm.max_requests = 200
 ; The log file for slow requests
 ; Default Value: not set
 ; Note: slowlog is mandatory if request_slowlog_timeout is set
-slowlog = /var/log/php83/$pool.slow.log
+slowlog = /var/log/php84/$pool.slow.log
 
 ; The timeout for serving a single request after which a PHP backtrace will be
 ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
@@ -408,6 +408,6 @@ clear_env = no
 ;                specified at startup with the -d argument
 ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f [email protected]
 php_flag[display_errors] = On
-php_admin_value[error_log] = /var/log/php83/$pool.error.log
+php_admin_value[error_log] = /var/log/php84/$pool.error.log
 php_admin_flag[log_errors] = On
 ;php_admin_value[memory_limit] = 32M

rootfs/etc/s6-overlay/s6-rc.d/init-php84-fpm/run

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# add environment variable into files
+dockerize -template /etc/php84/php.ini:/etc/php84/php.ini -template /etc/php84/php-fpm.conf:/etc/php84/php-fpm.conf -template /etc/php84/php-fpm.d:/etc/php84/php-fpm.d

rootfs/etc/s6-overlay/s6-rc.d/init-php84-fpm/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-php84-fpm/run

rootfs/etc/s6-overlay/s6-rc.d/svc-php84-fpm/run

@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+/usr/sbin/php-fpm84 --nodaemonize --fpm-config /etc/php84/php-fpm.conf

rootfs/etc/s6-overlay/s6-rc.d/svc-stdout/run

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash
 
-dockerize -stdout /var/www/storage/logs/laravel.log -stdout /var/log/nginx/error.log -stdout /var/log/php83/error.log -poll
+dockerize -stdout /var/www/storage/logs/laravel.log -stdout /var/log/nginx/error.log -stdout /var/log/php84/error.log -poll