[Add] 8.0.6-fpm-1.18.0-nginx-buster

README.md

@@ -16,7 +16,8 @@ You may also be interested in: [Workshops: Running Laravel on AWS ECS](https://g
 
 ## PHP 8.0
 
-- [`8.0.5-fpm-1.18.0-nginx-buster`](https://github.com/dwchiang/nginx-php-fpm/blob/master/buster/Dockerfile-8.0.5-fpm-1.18.0-nginx-buster), `latest`
+- [`8.0.6-fpm-1.18.0-nginx-buster`](https://github.com/dwchiang/nginx-php-fpm/blob/master/buster/Dockerfile-8.0.6-fpm-1.18.0-nginx-buster), `latest`
+- [`8.0.5-fpm-1.18.0-nginx-buster`](https://github.com/dwchiang/nginx-php-fpm/blob/master/buster/Dockerfile-8.0.5-fpm-1.18.0-nginx-buster),
 - [`8.0.5-fpm-1.18.0-nginx-alpine3.12`](https://github.com/dwchiang/nginx-php-fpm/blob/master/alpine3.12/Dockerfile-8.0.5-fpm-1.18.0-nginx-alpine3.12)
 - [`8.0.3-fpm-1.18.0-nginx-buster`](https://github.com/dwchiang/nginx-php-fpm/blob/master/buster/Dockerfile-8.0.3-fpm-1.18.0-nginx-buster)
 - [`8.0.3-fpm-1.18.0-nginx-alpine3.12`](https://github.com/dwchiang/nginx-php-fpm/blob/master/alpine3.12/Dockerfile-8.0.3-fpm-1.18.0-nginx-alpine3.12)

buildOnGitHubActions.sh

@@ -14,6 +14,13 @@ export VERSION_OS=buster
 ### ----------------------------------------------------------
 ### PHP 8.0
 
+export VERSION_PHP_FPM=8.0.6
+export VERSION_NGINX=1.18.0
+export VERSION_LARAVEL=8.5.5
+export IS_LATEST=true
+
+make $BUILD_CMD
+
 # export VERSION_PHP_FPM=8.0.5
 # export VERSION_NGINX=1.18.0
 # export VERSION_LARAVEL=8.5.5
@@ -52,12 +59,12 @@ export VERSION_OS=buster
 ### ----------------------------------------------------------
 ### PHP 7.4
 
-export VERSION_PHP_FPM=7.4.18
-export VERSION_NGINX=1.18.0
-export VERSION_LARAVEL=7.30.0
-export IS_LATEST=false
+# export VERSION_PHP_FPM=7.4.18
+# export VERSION_NGINX=1.18.0
+# export VERSION_LARAVEL=7.30.0
+# export IS_LATEST=false
 
-make $BUILD_CMD
+# make $BUILD_CMD
 
 # export VERSION_PHP_FPM=7.4.16
 # export VERSION_NGINX=1.18.0
@@ -203,12 +210,12 @@ export VERSION_OS=alpine3.12
 ### ----------------------------------------------------------
 ### PHP 7.4
 
-export VERSION_PHP_FPM=7.4.18
-export VERSION_NGINX=1.18.0
-export VERSION_LARAVEL=7.30.0
-export IS_LATEST=false
+# export VERSION_PHP_FPM=7.4.18
+# export VERSION_NGINX=1.18.0
+# export VERSION_LARAVEL=7.30.0
+# export IS_LATEST=false
 
-make $BUILD_CMD
+# make $BUILD_CMD
 
 # export VERSION_PHP_FPM=7.4.16
 # export VERSION_NGINX=1.18.0

buster/Dockerfile-8.0.6-fpm-1.18.0-nginx-buster

@@ -0,0 +1,140 @@
+FROM php:8.0.6-fpm-buster
+
+LABEL maintainer="Ernest Chiang <me@ernestchiang.com>"
+
+ARG VERSION_OS
+ENV VERSION_OS=${VERSION_OS} 
+
+### ----------------------------------------------------------
+### Part 1 of Nginx Dockerfile source https://hub.docker.com/_/nginx/
+### https://github.com/nginxinc/docker-nginx/blob/9774b522d4661effea57a1fbf64c883e699ac3ec/stable/alpine/Dockerfile
+### ----------------------------------------------------------
+
+ENV NGINX_VERSION   1.18.0
+ENV NJS_VERSION     0.4.3
+ENV PKG_RELEASE     1~buster
+
+RUN set -x \
+# create nginx user/group first, to be consistent throughout docker variants
+    && addgroup --system --gid 101 nginx \
+    && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
+    && \
+    NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
+    found=''; \
+    for server in \
+        ha.pool.sks-keyservers.net \
+        hkp://keyserver.ubuntu.com:80 \
+        hkp://p80.pool.sks-keyservers.net:80 \
+        pgp.mit.edu \
+    ; do \
+        echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
+        apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
+    apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
+    && dpkgArch="$(dpkg --print-architecture)" \
+    && nginxPackages=" \
+        nginx=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-${PKG_RELEASE} \
+    " \
+    && case "$dpkgArch" in \
+        amd64|i386) \
+# arches officialy built by upstream
+            echo "deb https://nginx.org/packages/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \
+            && apt-get update \
+            ;; \
+        *) \
+# we're on an architecture upstream doesn't officially build for
+# let's build binaries from the published source packages
+            echo "deb-src https://nginx.org/packages/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \
+            \
+# new directory for storing sources and .deb files
+            && tempDir="$(mktemp -d)" \
+            && chmod 777 "$tempDir" \
+# (777 to ensure APT's "_apt" user can access it too)
+            \
+# save list of currently-installed packages so build dependencies can be cleanly removed later
+            && savedAptMark="$(apt-mark showmanual)" \
+            \
+# build .deb files from upstream's source packages (which are verified by apt-get)
+            && apt-get update \
+            && apt-get build-dep -y $nginxPackages \
+            && ( \
+                cd "$tempDir" \
+                && DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
+                    apt-get source --compile $nginxPackages \
+            ) \
+# we don't remove APT lists here because they get re-downloaded and removed later
+            \
+# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# (which is done after we install the built packages so we don't have to redownload any overlapping dependencies)
+            && apt-mark showmanual | xargs apt-mark auto > /dev/null \
+            && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
+            \
+# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
+            && ls -lAFh "$tempDir" \
+            && ( cd "$tempDir" && dpkg-scanpackages . > Packages ) \
+            && grep '^Package: ' "$tempDir/Packages" \
+            && echo "deb [ trusted=yes ] file://$tempDir ./" > /etc/apt/sources.list.d/temp.list \
+# work around the following APT issue by using "Acquire::GzipIndexes=false" (overriding "/etc/apt/apt.conf.d/docker-gzip-indexes")
+#   Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
+#   ...
+#   E: Failed to fetch store:/var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages  Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
+            && apt-get -o Acquire::GzipIndexes=false update \
+            ;; \
+    esac \
+    \
+    && apt-get install --no-install-recommends --no-install-suggests -y \
+                        $nginxPackages \
+                        gettext-base \
+                        curl \
+    && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
+    \
+# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
+    && if [ -n "$tempDir" ]; then \
+        apt-get purge -y --auto-remove \
+        && rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
+    fi \
+# forward request and error logs to docker log collector
+    && ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log \
+# create a docker-entrypoint.d directory
+    && mkdir /docker-entrypoint.d
+
+COPY buster/scripts/docker-entrypoint.sh /
+COPY buster/scripts/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
+COPY buster/scripts/20-envsubst-on-templates.sh /docker-entrypoint.d
+# ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 80
+
+STOPSIGNAL SIGTERM
+
+### ----------------------------------------------------------
+### Setup supervisord, nginx config
+### ----------------------------------------------------------
+
+RUN set -x && \
+    apt-get update && \
+    apt-get install --no-install-recommends --no-install-suggests -y  \
+        supervisor \
+        && \
+    rm -Rf /etc/nginx/nginx.conf && \
+    rm -Rf /etc/nginx/conf.d/default.conf && \
+    # folders
+    mkdir -p /var/log/supervisor
+
+COPY buster/conf/supervisord.conf /etc/supervisord.conf
+COPY buster/conf/nginx.conf /etc/nginx/nginx.conf
+COPY buster/conf/nginx-default.conf /etc/nginx/conf.d/default.conf
+
+### ----------------------------------------------------------
+### CMD
+### ----------------------------------------------------------
+
+CMD ["/docker-entrypoint.sh"]

docker-compose-8.5.5-laravel.yml

@@ -30,6 +30,7 @@ services:
 
   database:
     image: percona:5.7
+    # platform: linux/amd64
     networks:
       - net_db
     restart: always