Merge pull request #183 from bryanlatten/php-8.0

PHP 8.0: basic implementation

Author: bryanlatten

.travis.yml

@@ -7,6 +7,7 @@ env:
   - PHP_VARIANT=7.3
   - PHP_VARIANT=7.3-alpine
   - PHP_VARIANT=7.4
+  - PHP_VARIANT=8.0
 
 services:
   - docker

Dockerfile-8.0

@@ -0,0 +1,150 @@
+FROM behance/docker-nginx:8.9
+LABEL maintainers="Behance Team <dev-behance@adobe.com>"
+
+# Set TERM to suppress warning messages.
+ENV CONF_PHPFPM=/etc/php/8.0/fpm/php-fpm.conf \
+    CONF_PHPMODS=/etc/php/8.0/mods-available \
+    CONF_FPMPOOL=/etc/php/8.0/fpm/pool.d/www.conf \
+    CONF_FPMOVERRIDES=/etc/php/8.0/fpm/conf.d/overrides.user.ini \
+    APP_ROOT=/app \
+    SERVER_WORKER_CONNECTIONS=3072 \
+    SERVER_CLIENT_BODY_BUFFER_SIZE=128k \
+    SERVER_CLIENT_HEADER_BUFFER_SIZE=1k \
+    SERVER_CLIENT_BODY_BUFFER_SIZE=128k \
+    SERVER_LARGE_CLIENT_HEADER_BUFFERS="4 256k" \
+    PHP_FPM_MAX_CHILDREN=4096 \
+    PHP_FPM_START_SERVERS=20 \
+    PHP_FPM_MAX_REQUESTS=1024 \
+    PHP_FPM_MIN_SPARE_SERVERS=5 \
+    PHP_FPM_MAX_SPARE_SERVERS=128 \
+    PHP_FPM_MEMORY_LIMIT=256M \
+    PHP_FPM_MAX_EXECUTION_TIME=60 \
+    PHP_FPM_UPLOAD_MAX_FILESIZE=1M \
+    PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
+    PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
+    PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
+    PHP_OPCACHE_ENABLE_CLI=1 \
+    PHP_ENGINE_VERSION=20200930 \
+    CFG_APP_DEBUG=1
+
+# - Update security packages, only
+RUN /bin/bash -e /security_updates.sh && \
+    apt-get install -yqq --no-install-recommends \
+        gpg-agent \
+        git \
+        curl \
+        wget \
+        software-properties-common \
+        locales \
+    && \
+    locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
+    add-apt-repository ppa:ondrej/php -y && \
+    echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list && \
+    wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
+    # Prevent newrelic install from prompting for input \
+    echo newrelic-php5 newrelic-php5/application-name string "REPLACE_NEWRELIC_APP" | debconf-set-selections && \
+    echo newrelic-php5 newrelic-php5/license-key string "REPLACE_NEWRELIC_LICENSE" | debconf-set-selections && \
+    # Perform cleanup \
+    apt-get remove --purge -yq \
+        patch \
+        software-properties-common \
+        locales \
+        wget \
+    && \
+    /bin/bash /clean.sh
+
+# Add PHP and support packages
+COPY container/root/usr/local/bin/pecl-install /usr/local/bin
+RUN apt-get update -q && \
+    # Ensure old versions of PHP don't accidentally get added by PPA maintainers
+    apt-mark hold \
+            manpages \
+            manpages-dev \
+            apache2 \
+            apache2-bin \
+            libapache2-mod-php7.4 \
+            php5.6-cli \
+            php5.6-common \
+            php5.6-json \
+            php7.0-cli \
+            php7.0-common \
+            php7.0-json \
+            php7.1-cli \
+            php7.1-common \
+            php7.1-json \
+            php7.2-cli \
+            php7.2-common \
+            php7.2-json \
+            php7.3-cli \
+            php7.3-common \
+            php7.3-json \
+            php7.4-cli \
+            php7.4-common \
+            php7.4-json
+
+RUN apt-get -yqq install \
+        php8.0 \
+        php8.0-apcu \
+        php8.0-bcmath \
+        php8.0-bz2 \
+        php8.0-curl \
+        php8.0-fpm \
+        php8.0-gd \
+        php8.0-intl \
+        php8.0-mbstring \
+        php8.0-memcache \
+        php8.0-memcached \
+        php8.0-mysql \
+        php8.0-pgsql \
+        php8.0-redis \
+        php8.0-xdebug \
+        php8.0-xml \
+        php8.0-yaml \
+        php8.0-zip \
+        newrelic-php5 \
+        newrelic-php5-common \
+        newrelic-daemon \
+    && \
+    /bin/bash /clean.sh \
+    && \
+    phpenmod memcached && \
+    phpenmod igbinary && \
+    phpenmod msgpack && \
+    phpdismod pdo_pgsql && \
+    phpdismod pgsql && \
+    phpdismod redis && \
+    phpdismod yaml && \
+    phpdismod xdebug && \
+    # Remove extra extensions installed via packages for other versions of PHP, leaving the active engine folder
+    cd /usr/lib/php && \
+    ls -d */ | grep '[0-9]\{8\}' | grep -v ${PHP_ENGINE_VERSION} | xargs rm -rf && \
+    rm -rf /usr/lib/php/7.4 && \
+    # Remove unused agents for other PHP versions
+    cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-${PHP_ENGINE_VERSION}.so | xargs rm && \
+    cd / && \
+    curl -sS https://getcomposer.org/installer | php && \
+    mv composer.phar /usr/local/bin/composer && \
+    /bin/bash /clean.sh
+
+# Overlay the root filesystem from this repo
+COPY ./container/root /
+
+# - Make additional hacks to migrate files/config from 7.0 --> 8.0 folder
+RUN cp /etc/php/7.0/mods-available/* $CONF_PHPMODS && \
+    cp /etc/php/7.0/fpm/conf.d/overrides.user.ini $CONF_FPMOVERRIDES && \
+    # Hack: share startup scripts between variant versions by symlinking \
+    ln -s /usr/sbin/php-fpm8.0 /usr/sbin/php-fpm && \
+    # Override default ini values for both CLI + FPM \
+    phpenmod overrides && \
+    # Enable NewRelic via Ubuntu symlinks, but disable in file. Cross-variant startup script uncomments with env vars.
+    phpenmod newrelic && \
+    # Run standard set of tweaks to ensure runs performant, reliably, and consistent between variants
+    /bin/bash -e /prep-php.sh && \
+    # New 7.3+ specific configuration
+    sed -i "s/;decorate_workers_output.*/decorate_workers_output = no/" $CONF_FPMPOOL
+
+# HACK: workaround for https://github.com/aelsabbahy/goss/issues/392
+# Run the child and parent test configs separately instead of leveraging inheritance
+RUN goss -g /tests/php-fpm/8.0.goss.yaml validate && \
+    goss -g /tests/php-fpm/base.goss.yaml validate && \
+    /aufs_hack.sh

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/behance/docker-php.svg?branch=master)](https://travis-ci.org/behance/docker-php)
+[![Build Status](https://travis-ci.com/behance/docker-php.svg?branch=master)](https://travis-ci.org/behance/docker-php)
 [![Docker Pulls](https://img.shields.io/docker/pulls/bryanlatten/docker-php.svg?maxAge=2592000)]()
 
 docker-php
@@ -12,13 +12,13 @@ Available on [Docker Hub](https://hub.docker.com/r/behance/docker-php/).
 
 ### Quick-start
 
-- `docker run behance/docker-php:5.6 "php" "-v"`
 - `docker run behance/docker-php:7.0 "php" "-v"`
 - `docker run behance/docker-php:7.1 "php" "-v"`
 - `docker run behance/docker-php:7.2 "php" "-v"`
 - `docker run behance/docker-php:7.3-alpine "php" "-v"`
 - `docker run behance/docker-php:7.3" "php" "-v"`
 - `docker run behance/docker-php:7.4" "php" "-v"`
+- `docker run behance/docker-php:8.0" "php" "-v"`
 
 Adding code to runtime, see [here](https://github.com/behance/docker-php#expectations).
 PHP tuning and configuration, see [here](https://github.com/behance/docker-php#downstream-configuration).
@@ -27,8 +27,8 @@ Adding startup logic, [basic](https://github.com/behance/docker-base#startuprunt
 
 #### Container tag scheme: `PHP_MAJOR.PHP_MINOR(-Major.Minor.Patch)(-variant)`
 
-- `PHP_MAJOR.PHP_MINOR`, required. Engine versions of PHP. ex. `docker-php:7.4`
-- `(Major.Minor.Patch)`, optional. Semantically versioned container provisioning code. ex. `docker-php:7.3-13.4.0`.
+- `PHP_MAJOR.PHP_MINOR`, required. Engine versions of PHP. ex. `docker-php:8.0`
+- `(Major.Minor.Patch)`, optional. Semantically versioned container provisioning code. ex. `docker-php:7.4-13.4.0`.
 - `(-variant)`, optional. Alpine variants are slim versions of the container. ex. `docker-php:7.3-alpine`.
 
 ### Includes
@@ -102,10 +102,10 @@ For extension customization, including enabling and disabling defaults, see [her
 
 Sample `Dockerfile`
 ```
-FROM behance/docker-php:7.4
+FROM behance/docker-php:8.0
 
 # (optional, recommended) Verify everything is in order from the parent
-RUN goss -g /tests/php-fpm/7.4.goss.yaml validate && /aufs_hack.sh
+RUN goss -g /tests/php-fpm/8.0.goss.yaml validate && /aufs_hack.sh
 
 # Layer local code into runtime
 COPY ./ /app/
@@ -213,10 +213,10 @@ PHP_FPM_LOG_BUFFERING | PHP_FPM_LOG_BUFFERING=no | yes | PHP 7.3+ only [docs](ht
 ---
 - Requires `bash`, `docker`, `docker-compose`, and `dgoss`
 
-To test locally, run `PHP_VARIANT=7.4 ./test.sh {docker engine IP}`.
+To test locally, run `PHP_VARIANT=8.0 ./test.sh {docker engine IP}`.
 
 This will:
-- Build a single container `PHP_VARIANT` (7.0, 7.1, 7.2, 7.3, 7.3-alpine, 7.4)
+- Build a single container `PHP_VARIANT` (7.0, 7.1, 7.2, 7.3, 7.3-alpine, 7.4, 8.0)
 - Leverages [Goss](https://goss.rocks) to confirm package, config, and extension installation
 - Validates a large file upload
 - Boots container with specific NewRelic configuration overrides

container/root/tests/php-fpm/8.0.goss.yaml

@@ -0,0 +1,29 @@
+
+# Extended file tests will be overridden/ignored from parent
+# Note: Other variants may not include extended file tests, are not susceptible
+# @see https://github.com/aelsabbahy/goss/issues/392
+
+# gossfile:
+#   base.goss.yaml: {}
+
+command:
+  # IMPORTANT: confirm the major/minor version of PHP itself
+  php -r 'echo PHP_MAJOR_VERSION;':
+    exit-status: 0
+    stdout: [8]
+  php -r 'echo PHP_MINOR_VERSION;':
+    exit-status: 0
+    stdout: [0]
+  php-fpm -v:
+    exit-status: 0
+    stdout: [PHP 8.0]
+  # Not common to all variants, test in supported children
+  php -m | grep -i memcache:
+    exit-status: 0
+
+# Using workaround commands until https://github.com/aelsabbahy/goss/issues/392 is solved
+file:
+  {{ .Env.CONF_FPMPOOL }}:
+    exists: true
+    contains:
+      - '/^decorate_workers_output = no/'

docker-compose.yml

@@ -0,0 +1,11 @@
+file:
+  /etc/php/8.0/mods-available/newrelic.ini:
+    exists: true
+    mode: "0644"
+    filetype: file # file, symlink, directory
+    contains:  # Check file content for these patterns
+      - '/^newrelic.transaction_tracer.enabled = true/'
+      - '/^newrelic.distributed_tracing_enabled = true/'
+      - '/^newrelic.loglevel = \"verbosedebug\"/'
+      - '/^newrelic.daemon.loglevel = \"verbosedebug\"/'
+      - '/^newrelic.special=debug_autorum/'

runtime-tests/newrelic/8.0/goss.yaml

@@ -0,0 +1,6 @@
+file:
+  /goss/docker_output.log:
+    exists: true
+    filetype: file # file, symlink, directory
+    contains:  # Check file content for these patterns
+      - '/launching...$/'