ARM images

Author: Daynnnnn

build/build-7.4.sh

@@ -4,4 +4,4 @@
 BUILDNUMBER=$bamboo_buildNumber
 
 # PHP
-docker build --build-arg PHP_VERSION=7.4 --build-arg ATATUS_VERSION=1.9.0 -t prlx/k8s-openresty-php-php:build-$BUILDNUMBER-php-7.4 -f php/Dockerfile-7.4 .
+docker buildx build --push --platform=linux/arm64/v8,linux/amd64 -t prlx/k8s-openresty-php-php:build-$BUILDNUMBER-php-7.4 -f php/Dockerfile-7.4 .

build/build-8.0.sh

@@ -4,4 +4,4 @@
 BUILDNUMBER=$bamboo_buildNumber
 
 # PHP
-docker build --build-arg PHP_VERSION=8 --build-arg ATATUS_VERSION=1.11.0 -t prlx/k8s-openresty-php-php:build-$BUILDNUMBER-php-8.0 -f php/Dockerfile-8.0 .
+docker buildx build --push --platform=linux/arm64/v8,linux/amd64 -t prlx/k8s-openresty-php-php:build-$BUILDNUMBER-php-8.0 -f php/Dockerfile-8.0 .

build/build-8.1.sh

@@ -4,4 +4,4 @@
 BUILDNUMBER=$bamboo_buildNumber
 
 # PHP
-docker build --build-arg PHP_VERSION=81 --build-arg ATATUS_VERSION=1.13.0 -t prlx/k8s-openresty-php-php:build-$BUILDNUMBER-php-8.1 -f php/Dockerfile-8.1 .
+docker buildx build --push --platform=linux/arm64/v8,linux/amd64 -t prlx/k8s-openresty-php-php:build-$BUILDNUMBER-php-8.1 -f php/Dockerfile-8.1 .

php/Dockerfile-7.4

@@ -1,6 +1,6 @@
 FROM alpine:3.14
 
-ARG ATATUS_VERSION=1.12.0
+ARG ATATUS_VERSION=1.14.0
 ARG ATATUS_ENABLED=TRUE
 
 ENV \
@@ -71,7 +71,7 @@ ENV \
 
 # Install deps
 RUN apk add --no-cache \
-	curl \
+    curl \
     ca-certificates \
     supervisor \
     bash \
@@ -84,66 +84,66 @@ RUN apk add --no-cache \
     nano
 
 RUN apk add --no-cache \ 
-		php7 \
-		php7-phar \
-		php7-bcmath \
-		php7-calendar \
-		php7-mbstring \
-		php7-exif \
+        php7 \
+        php7-phar \
+        php7-bcmath \
+        php7-calendar \
+        php7-mbstring \
+        php7-exif \
         php7-fileinfo \
         php7-tokenizer \
         php7-simplexml \
         php7-xml \
         php7-xmlreader \
         php7-xmlwriter \
-		php7-ftp \
-		php7-openssl \
-		php7-zip \
-		php7-sysvsem \
-		php7-sysvshm \
-		php7-sysvmsg \
-		php7-shmop \
-		php7-sockets \
-		php7-zlib \
-		php7-bz2 \
-		php7-curl \
-		php7-xml \
-		php7-opcache \
-		php7-dom \
-		php7-xmlreader \
-		php7-ctype \
-		php7-gd \
-		php7-gettext \
-		php7-imagick \
-		php7-intl \
-		php7-ldap \
-		php7-intl \
-		php7-memcached \
-		php7-mysqli \
-		php7-mysqlnd \
-		php7-pcntl \
-		php7-pdo \
-		php7-pdo_mysql \
-		php7-pdo_sqlite \
-		php7-redis \
-		php7-soap \
-		php7-sqlite3 \
-		php7-tidy \
-		php7-xsl \
-		php7-session \
-		php7-iconv \
-		php7-json \
-		php7-posix \
-		php7-xmlrpc \
-		php7-fpm \
-		php7-apcu && \
-
-	ln -snf /usr/bin/php7 /usr/bin/php && \
-	ln -snf /usr/sbin/php-fpm7 /usr/sbin/php-fpm && \
-
-	# Symlink current version
-	mkdir /etc/php && \
-	ln -snf /etc/php7 /etc/php/current;
+        php7-ftp \
+        php7-openssl \
+        php7-zip \
+        php7-sysvsem \
+        php7-sysvshm \
+        php7-sysvmsg \
+        php7-shmop \
+        php7-sockets \
+        php7-zlib \
+        php7-bz2 \
+        php7-curl \
+        php7-xml \
+        php7-opcache \
+        php7-dom \
+        php7-xmlreader \
+        php7-ctype \
+        php7-gd \
+        php7-gettext \
+        php7-imagick \
+        php7-intl \
+        php7-ldap \
+        php7-intl \
+        php7-memcached \
+        php7-mysqli \
+        php7-mysqlnd \
+        php7-pcntl \
+        php7-pdo \
+        php7-pdo_mysql \
+        php7-pdo_sqlite \
+        php7-redis \
+        php7-soap \
+        php7-sqlite3 \
+        php7-tidy \
+        php7-xsl \
+        php7-session \
+        php7-iconv \
+        php7-json \
+        php7-posix \
+        php7-xmlrpc \
+        php7-fpm \
+        php7-apcu && \
+
+    ln -snf /usr/bin/php7 /usr/bin/php && \
+    ln -snf /usr/sbin/php-fpm7 /usr/sbin/php-fpm && \
+
+    # Symlink current version
+    mkdir /etc/php && \
+    ln -snf /etc/php7 /etc/php/current;
 
 # Composer
 RUN EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" && \
@@ -170,14 +170,15 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
 
 
 RUN if [ "$ATATUS_ENABLED" == "TRUE" ]; then \
-	# Atatus
-	wget https://s3.amazonaws.com/atatus-artifacts/atatus-php/downloads/atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && tar -xzvf atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && cd atatus-php-$ATATUS_VERSION-x64-musl && ./install.sh && rm -f /atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && rm -rf /atatus-php-$ATATUS_VERSION-x64-musl && \
-	sed -i -e 's#atatus.trace.response_time = 2000#atatus.trace.response_time = 1500#g' /etc/php/current/conf.d/atatus.ini && \
-	  sed -i -e 's#atatus.collector.pidfile = "/var/run/atatus-php-collector.pid"#atatus.collector.pidfile = "/run/atatus-php-collector.pid"#g' /etc/php/current/conf.d/atatus.ini && \
-	  sed -i -e 's#atatus.collector.connection = "/tmp/.atatus.sock"#atatus.collector.connection = "/run/atatus.sock"#g' /etc/php/current/conf.d/atatus.ini && \
-	# Write log files to stdout
-	rm -f /var/log/atatus/agent.log && rm -f /var/log/atatus/collector.log && rm -f /var/log/atatus/debug.txt && ln -sf /dev/null /var/log/atatus/agent.log && ln -sf /dev/null /var/log/atatus/collector.log && ln -sf /dev/null /var/log/atatus/debug.txt; \
-	fi
+    # Atatus
+    architecture=$(case $(uname -m) in i386 | i686 | x86) echo "i386" ;; x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "x64" ;; esac) && \
+    wget https://s3.amazonaws.com/atatus-artifacts/atatus-php/downloads/atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && tar -xzvf atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && cd atatus-php-$ATATUS_VERSION-$architecture-musl && ./install.sh && rm -f /atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && rm -rf /atatus-php-$ATATUS_VERSION-$architecture-musl && \
+    sed -i -e 's#atatus.trace.response_time = 2000#atatus.trace.response_time = 1500#g' /etc/php/current/conf.d/atatus.ini && \
+    sed -i -e 's#atatus.collector.pidfile = "/var/run/atatus-php-collector.pid"#atatus.collector.pidfile = "/run/atatus-php-collector.pid"#g' /etc/php/current/conf.d/atatus.ini && \
+    sed -i -e 's#atatus.collector.connection = "/tmp/.atatus.sock"#atatus.collector.connection = "/run/atatus.sock"#g' /etc/php/current/conf.d/atatus.ini && \
+    # Write log files to stdout
+    rm -f /var/log/atatus/agent.log && rm -f /var/log/atatus/collector.log && rm -f /var/log/atatus/debug.txt && ln -sf /dev/null /var/log/atatus/agent.log && ln -sf /dev/null /var/log/atatus/collector.log && ln -sf /dev/null /var/log/atatus/debug.txt; \
+    fi
 
 # PHP Config
 ADD /php/conf/php-fpm.conf /etc/php/current/php-fpm.conf

php/Dockerfile-8.0

@@ -1,7 +1,6 @@
 FROM alpine:3.14
 
-ARG PHP_VERSION=8
-ARG ATATUS_VERSION=1.12.0
+ARG ATATUS_VERSION=1.14.0
 ARG ATATUS_ENABLED=TRUE
 
 ENV \
@@ -57,7 +56,7 @@ ENV \
 
 # Install deps
 RUN apk add --no-cache \
-	curl \
+    curl \
     ca-certificates \
     supervisor \
     bash \
@@ -118,12 +117,12 @@ RUN apk add --no-cache \
     php8-fpm \
     php8-mysqli && \
 
-	ln -snf /usr/bin/php8 /usr/bin/php && \
-	ln -snf /usr/sbin/php-fpm8 /usr/sbin/php-fpm && \
+    ln -snf /usr/bin/php8 /usr/bin/php && \
+    ln -snf /usr/sbin/php-fpm8 /usr/sbin/php-fpm && \
 
-	# Symlink current version
-	mkdir /etc/php && \
-	ln -snf /etc/php8 /etc/php/current;
+    # Symlink current version
+    mkdir /etc/php && \
+    ln -snf /etc/php8 /etc/php/current;
 
 # Composer
 RUN EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" && \
@@ -149,14 +148,15 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 
 RUN if [ "$ATATUS_ENABLED" == "TRUE" ]; then \
-	# Atatus
-	wget https://s3.amazonaws.com/atatus-artifacts/atatus-php/downloads/atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && tar -xzvf atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && cd atatus-php-$ATATUS_VERSION-x64-musl && ./install.sh && rm -f /atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && rm -rf /atatus-php-$ATATUS_VERSION-x64-musl && \
-	sed -i -e 's#atatus.trace.response_time = 2000#atatus.trace.response_time = 1500#g' /etc/php/current/conf.d/atatus.ini && \
-	  sed -i -e 's#atatus.collector.pidfile = "/var/run/atatus-php-collector.pid"#atatus.collector.pidfile = "/run/atatus-php-collector.pid"#g' /etc/php/current/conf.d/atatus.ini && \
-	  sed -i -e 's#atatus.collector.connection = "/tmp/.atatus.sock"#atatus.collector.connection = "/run/atatus.sock"#g' /etc/php/current/conf.d/atatus.ini && \
-	# Write log files to stdout
-	rm -f /var/log/atatus/agent.log && rm -f /var/log/atatus/collector.log && rm -f /var/log/atatus/debug.txt && ln -sf /dev/null /var/log/atatus/agent.log && ln -sf /dev/null /var/log/atatus/collector.log && ln -sf /dev/null /var/log/atatus/debug.txt; \
-	fi
+    # Atatus
+    architecture=$(case $(uname -m) in i386 | i686 | x86) echo "i386" ;; x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "x64" ;; esac) && \
+    wget https://s3.amazonaws.com/atatus-artifacts/atatus-php/downloads/atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && tar -xzvf atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && cd atatus-php-$ATATUS_VERSION-$architecture-musl && ./install.sh && rm -f /atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && rm -rf /atatus-php-$ATATUS_VERSION-$architecture-musl && \
+    sed -i -e 's#atatus.trace.response_time = 2000#atatus.trace.response_time = 1500#g' /etc/php/current/conf.d/atatus.ini && \
+    sed -i -e 's#atatus.collector.pidfile = "/var/run/atatus-php-collector.pid"#atatus.collector.pidfile = "/run/atatus-php-collector.pid"#g' /etc/php/current/conf.d/atatus.ini && \
+    sed -i -e 's#atatus.collector.connection = "/tmp/.atatus.sock"#atatus.collector.connection = "/run/atatus.sock"#g' /etc/php/current/conf.d/atatus.ini && \
+    # Write log files to stdout
+    rm -f /var/log/atatus/agent.log && rm -f /var/log/atatus/collector.log && rm -f /var/log/atatus/debug.txt && ln -sf /dev/null /var/log/atatus/agent.log && ln -sf /dev/null /var/log/atatus/collector.log && ln -sf /dev/null /var/log/atatus/debug.txt; \
+    fi
 
 # PHP Config
 ADD /php/conf/php-fpm.conf /etc/php/current/php-fpm.conf

php/Dockerfile-8.1

@@ -1,7 +1,6 @@
 FROM alpine:edge
 
-ARG PHP_VERSION=8
-ARG ATATUS_VERSION=1.13.0
+ARG ATATUS_VERSION=1.14.0
 ARG ATATUS_ENABLED=TRUE
 
 ENV \
@@ -56,12 +55,9 @@ ENV \
         curl \
         bash"
 
-RUN echo -n "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
-    apk update
-
 # Install deps
 RUN apk add --no-cache \
-	curl \
+    curl \
     ca-certificates \
     supervisor \
     bash \
@@ -124,12 +120,12 @@ RUN apk add --no-cache \
     php81-mysqli \
     php81-sodium && \
 
-	ln -snf /usr/bin/php81 /usr/bin/php && \
-	ln -snf /usr/sbin/php-fpm81 /usr/sbin/php-fpm && \
+    ln -snf /usr/bin/php81 /usr/bin/php && \
+    ln -snf /usr/sbin/php-fpm81 /usr/sbin/php-fpm && \
 
-	# Symlink current version
-	mkdir /etc/php && \
-	ln -snf /etc/php81 /etc/php/current;
+    # Symlink current version
+    mkdir /etc/php && \
+    ln -snf /etc/php81 /etc/php/current;
 
 # Composer
 RUN EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" && \
@@ -155,14 +151,15 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 
 RUN if [ "$ATATUS_ENABLED" == "TRUE" ]; then \
-	# Atatus
-	wget https://s3.amazonaws.com/atatus-artifacts/atatus-php/downloads/atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && tar -xzvf atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && cd atatus-php-$ATATUS_VERSION-x64-musl && ./install.sh && rm -f /atatus-php-$ATATUS_VERSION-x64-musl.tar.gz && rm -rf /atatus-php-$ATATUS_VERSION-x64-musl && \
-	sed -i -e 's#atatus.trace.response_time = 2000#atatus.trace.response_time = 1500#g' /etc/php/current/conf.d/atatus.ini && \
-	  sed -i -e 's#atatus.collector.pidfile = "/var/run/atatus-php-collector.pid"#atatus.collector.pidfile = "/run/atatus-php-collector.pid"#g' /etc/php/current/conf.d/atatus.ini && \
-	  sed -i -e 's#atatus.collector.connection = "/tmp/.atatus.sock"#atatus.collector.connection = "/run/atatus.sock"#g' /etc/php/current/conf.d/atatus.ini && \
-	# Write log files to stdout
-	rm -f /var/log/atatus/agent.log && rm -f /var/log/atatus/collector.log && rm -f /var/log/atatus/debug.txt && ln -sf /dev/null /var/log/atatus/agent.log && ln -sf /dev/null /var/log/atatus/collector.log && ln -sf /dev/null /var/log/atatus/debug.txt; \
-	fi
+    # Atatus
+    architecture=$(case $(uname -m) in i386 | i686 | x86) echo "i386" ;; x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "x64" ;; esac) && \
+    wget https://s3.amazonaws.com/atatus-artifacts/atatus-php/downloads/atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && tar -xzvf atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && cd atatus-php-$ATATUS_VERSION-$architecture-musl && ./install.sh && rm -f /atatus-php-$ATATUS_VERSION-$architecture-musl.tar.gz && rm -rf /atatus-php-$ATATUS_VERSION-$architecture-musl && \
+    sed -i -e 's#atatus.trace.response_time = 2000#atatus.trace.response_time = 1500#g' /etc/php/current/conf.d/atatus.ini && \
+    sed -i -e 's#atatus.collector.pidfile = "/var/run/atatus-php-collector.pid"#atatus.collector.pidfile = "/run/atatus-php-collector.pid"#g' /etc/php/current/conf.d/atatus.ini && \
+    sed -i -e 's#atatus.collector.connection = "/tmp/.atatus.sock"#atatus.collector.connection = "/run/atatus.sock"#g' /etc/php/current/conf.d/atatus.ini && \
+    # Write log files to stdout
+    rm -f /var/log/atatus/agent.log && rm -f /var/log/atatus/collector.log && rm -f /var/log/atatus/debug.txt && ln -sf /dev/null /var/log/atatus/agent.log && ln -sf /dev/null /var/log/atatus/collector.log && ln -sf /dev/null /var/log/atatus/debug.txt; \
+    fi
 
 # PHP Config
 ADD /php/conf/php-fpm.conf /etc/php/current/php-fpm.conf