Merge pull request #172 from bryanlatten/dep-unlock

Dep unlock

Author: bryanlatten

.test.env

@@ -0,0 +1,11 @@
+CFG_APP_DEBUG=1
+SERVER_LOG_MINIMAL=1
+PHP_FPM_MEMORY_LIMIT=257M
+PHP_FPM_MAX_EXECUTION_TIME=61
+PHP_FPM_UPLOAD_MAX_FILESIZE=100M
+SERVER_MAX_BODY_SIZE=100m
+SERVER_APP_NAME=docker-test
+REPLACE_NEWRELIC_APP=abcdefg
+REPLACE_NEWRELIC_LICENSE=hijklmno
+S6_KILL_FINISH_MAXTIME=1
+S6_KILL_GRACETIME=1

.travis.yml

@@ -1,26 +1,20 @@
 sudo: required
 
 env:
-  DOCKER_COMPOSE_VERSION: 1.17.1
-  GOSS_PATH: ./goss 
+  - PHP_VARIANT=7.0
+  - PHP_VARIANT=7.1
+  - PHP_VARIANT=7.2
+  - PHP_VARIANT=7.3
+  - PHP_VARIANT=7.3-alpine
+  - PHP_VARIANT=7.4
 
 services:
   - docker
 
 before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
   - curl -L https://raw.githubusercontent.com/aelsabbahy/goss/master/extras/dgoss/dgoss -o dgoss
-  - curl -L https://github.com/aelsabbahy/goss/releases/download/v0.3.6/goss-linux-amd64 -o goss
+  - curl -L https://github.com/aelsabbahy/goss/releases/download/v0.3.9/goss-linux-amd64 -o goss
   - chmod 755 dgoss goss
 
-# - Build and run all variants
-# - Ensure text from phpinfo is present in default response
-# - Create a 98MB tmp file
-# - Upload file to each variant
-# - Ensure text from phpinfo is present in response to upload, which is returned for everything
-# ---- mainly to check /tmp permission issues from nginx
 script:
-- bash ./test.sh localhost
+  - ./test.sh localhost

Dockerfile-70 Dockerfile-7.0Dockerfile-70 renamed to Dockerfile-7.0

@@ -51,7 +51,8 @@ RUN /bin/bash -e /security_updates.sh && \
     && \
     /bin/bash /clean.sh
 
-# Add PHP and support packages \
+# Add PHP and support packages
+COPY container/root/usr/local/bin/pecl-install /usr/local/bin
 RUN apt-get update -q && \
     # Ensure PHP 5.5 + 5.6 + 7.1 don't accidentally get added by PPA
     apt-mark hold \
@@ -67,6 +68,9 @@ RUN apt-get update -q && \
             php7.3-cli \
             php7.3-common \
             php7.3-json \
+            php7.4-cli \
+            php7.4-common \
+            php7.4-json \
     && \
     apt-get -yqq install \
         php7.0 \
@@ -103,10 +107,12 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20131226 && \
     rm -rf /usr/lib/php/20160303 && \
     rm -rf /usr/lib/php/20170718 && \
+    rm -rf /usr/lib/php/20180731 && \
+    rm -rf /usr/lib/php/20190902 && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
     # Install new PHP7-stable version of Redis \
-    pecl install redis-4.2.0 && \
+    pecl install redis && \
     echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \

Dockerfile-71 Dockerfile-7.1Dockerfile-71 renamed to Dockerfile-7.1

@@ -51,7 +51,8 @@ RUN /bin/bash -e /security_updates.sh && \
     && \
     /bin/bash /clean.sh
 
-# Add PHP and support packages \
+# Add PHP and support packages
+COPY container/root/usr/local/bin/pecl-install /usr/local/bin
 RUN apt-get update -q && \
     # Ensure PHP 5.5 + 5.6 + 7.0 don't accidentally get added by PPA
     apt-mark hold \
@@ -67,6 +68,9 @@ RUN apt-get update -q && \
             php7.3-cli \
             php7.3-common \
             php7.3-json \
+            php7.4-cli \
+            php7.4-common \
+            php7.4-json \
     && \
     apt-get -yqq install \
         php7.1 \
@@ -103,11 +107,14 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20131226 && \
     rm -rf /usr/lib/php/20151012 && \
     rm -rf /usr/lib/php/20170718 && \
+    rm -rf /usr/lib/php/20180731 && \
+    rm -rf /usr/lib/php/20190902 && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # Install new PHP 7.1-stable version of Redis
-    pecl install redis-4.2.0 && \
-    echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
+    # Install new stable versions of non-packaged extensions
+    pecl-install \
+        redis \
+    && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \
         php7.1-dev \

Dockerfile-72 Dockerfile-7.2Dockerfile-72 renamed to Dockerfile-7.2

@@ -51,10 +51,8 @@ RUN /bin/bash -e /security_updates.sh && \
     && \
     /bin/bash /clean.sh
 
-# TODO: fix these packages:
-# php7.2-mcrypt
-
-# Add PHP and support packages \
+# Add PHP and support packages
+COPY container/root/usr/local/bin/pecl-install /usr/local/bin
 RUN apt-get update -q && \
     # Ensure PHP 5.5 + 5.6 + 7.1 don't accidentally get added by PPA
     apt-mark hold \
@@ -70,6 +68,9 @@ RUN apt-get update -q && \
             php7.3-cli \
             php7.3-common \
             php7.3-json \
+            php7.4-cli \
+            php7.4-common \
+            php7.4-json \
     && \
     apt-get -yqq install \
         php7.2 \
@@ -106,11 +107,14 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20131226 && \
     rm -rf /usr/lib/php/20151012 && \
     rm -rf /usr/lib/php/20160303 && \
+    rm -rf /usr/lib/php/20180731 && \
+    rm -rf /usr/lib/php/20190902 && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # Install new PHP 7.X-stable version of Redis
-    pecl install redis-4.2.0 && \
-    echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
+    # Install new stable versions of non-packaged extensions
+    pecl-install \
+        redis \
+    && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \
         php7.2-dev \

Dockerfile-73 Dockerfile-7.3Dockerfile-73 renamed to Dockerfile-7.3

@@ -51,10 +51,8 @@ RUN /bin/bash -e /security_updates.sh && \
     && \
     /bin/bash /clean.sh
 
-# TODO: fix these packages:
-# php7.3-mcrypt
-
-# Add PHP and support packages \
+# Add PHP and support packages
+COPY container/root/usr/local/bin/pecl-install /usr/local/bin
 RUN apt-get update -q && \
     # Ensure PHP 5.5 + 5.6 + 7.1 don't accidentally get added by PPA
     apt-mark hold \
@@ -70,10 +68,13 @@ RUN apt-get update -q && \
             php7.2-cli \
             php7.2-common \
             php7.2-json \
+            php7.4-cli \
+            php7.4-common \
+            php7.4-json \
     && \
     apt-get -yqq install \
         php7.3 \
-        # php7.3-apcu \
+        php7.3-apcu \
         php7.3-bcmath \
         php7.3-bz2 \
         php7.3-curl \
@@ -107,14 +108,13 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20151012 && \
     rm -rf /usr/lib/php/20160303 && \
     rm -rf /usr/lib/php/20170718 && \
+    rm -rf /usr/lib/php/20190902 && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # Install new stable versions of non-packages extensions
-    pecl install apcu && \
-    echo "extension=apcu.so" > $CONF_PHPMODS/apcu.ini && \
-    phpenmod apcu && \
-    pecl install redis-4.2.0 && \
-    echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
+    # Install new stable versions of non-packaged extensions
+    pecl-install \
+        redis \
+    && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \
         php7.3-dev \

Dockerfile-72-alpine Dockerfile-7.3-alpineDockerfile-72-alpine renamed to Dockerfile-7.3-alpine

@@ -97,7 +97,7 @@ RUN NEWRELIC_MUSL_PATH=$(curl -s https://download.newrelic.com/php_agent/release
     cd $NEWRELIC_DIRECTORY && \
     echo "\n" | ./newrelic-install install && \
     chown root:root $NEWRELIC_DIRECTORY/agent/x64/newrelic-20160303.so && \
-    mv $NEWRELIC_DIRECTORY/agent/x64/newrelic-20170718.so /usr/lib/php7/modules/newrelic.so && \
+    mv $NEWRELIC_DIRECTORY/agent/x64/newrelic-20180731.so /usr/lib/php7/modules/newrelic.so && \
     rm -rf $NEWRELIC_DIRECTORY/agent/x64 && \
     # Fix permissions on extracted folder \
     chown -R $NOT_ROOT_USER:$NOT_ROOT_USER * && \
@@ -117,15 +117,15 @@ RUN apk update && \
         autoconf file g++ gcc libc-dev make pkgconf re2c php7-dev php7-pear \
     && \
     sed -i 's/^exec $PHP -C -n/exec $PHP -C/g' $(which pecl) && \
-    pecl install igbinary-3.0.1 && \
+    pecl install igbinary && \
     echo "extension=igbinary.so" > $CONF_PHPMODS/igbinary.ini && \
-    pecl install yaml-2.0.4 && \
+    pecl install yaml && \
     echo ";extension=yaml.so" > $CONF_PHPMODS/yaml.ini && \
-    pecl install redis-4.2.0 && \
+    pecl install redis && \
     echo ";extension=redis.so" > $CONF_PHPMODS/redis.ini && \
-    pecl install msgpack-2.0.3 && \
+    pecl install msgpack && \
     echo "extension=msgpack.so" > $CONF_PHPMODS/msgpack.ini && \
-    pecl install memcached-3.1.3 && \
+    pecl install memcached && \
     echo "extension=memcached.so" > $CONF_PHPMODS/memcached.ini && \
     rm -rf /usr/share/php7 && \
     apk del .phpize_deps && \
@@ -142,5 +142,5 @@ RUN cp /etc/php/7.0/mods-available/* $CONF_PHPMODS && \
     ln -s /usr/sbin/php-fpm7 /usr/sbin/php-fpm && \
     /bin/bash -e prep-php.sh
 
-RUN goss -g /tests/php-fpm/7.2-alpine.goss.yaml validate && \
+RUN goss -g /tests/php-fpm/7.3-alpine.goss.yaml validate && \
     /aufs_hack.sh

Dockerfile-74 Dockerfile-7.4Dockerfile-74 renamed to Dockerfile-7.4

@@ -114,7 +114,7 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/7.3 && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # Install new stable versions of non-packages extensions
+    # Install new stable versions of non-packaged extensions
     pecl-install \
         apcu \
         igbinary \

README.md

@@ -16,8 +16,9 @@ Available on [Docker Hub](https://hub.docker.com/r/behance/docker-php/).
 - `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.2-alpine "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"`
 
 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).
@@ -26,9 +27,9 @@ 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.1`
-- `(Major.Minor.Patch)`, optional. Semantically versioned container provisioning code. ex. `docker-php:7.1-12.4.0`.
-- `(-variant)`, optional. Alpine variants are slim versions of the container. ex. `docker-php:7.1-alpine`.
+- `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`.
+- `(-variant)`, optional. Alpine variants are slim versions of the container. ex. `docker-php:7.3-alpine`.
 
 ### Includes
 ---
@@ -43,8 +44,7 @@ Adding startup logic, [basic](https://github.com/behance/docker-base#startuprunt
 For extension customization, including enabling and disabling defaults, see [here](https://github.com/behance/docker-php#downstream-configuration)
 
 `^`  - not available on `-alpine` variant
-`*`  - not available on `7.2`
-`**` - not available on `7.3`
+`*`  - not available on `7.2+`
 `~`  - disabled by default
 
   - apcu
@@ -63,7 +63,7 @@ For extension customization, including enabling and disabling defaults, see [her
   - intl
   - json
   - mbstring
-  - mcrypt *,**
+  - mcrypt *
   - memcache ^
   - memcached
   - msgpack
@@ -87,7 +87,7 @@ For extension customization, including enabling and disabling defaults, see [her
   - sysvsem
   - sysvshm
   - tokenizer
-  - xdebug ~,*,**
+  - xdebug ~,*
   - xml
   - xmlreader
   - xmlwriter
@@ -102,10 +102,10 @@ For extension customization, including enabling and disabling defaults, see [her
 
 Sample `Dockerfile`
 ```
-FROM behance/docker-php:7.1
+FROM behance/docker-php:7.4
 
 # (optional, recommended) Verify everything is in order from the parent
-RUN goss -g /tests/php-fpm/7.1.goss.yaml validate && /aufs_hack.sh
+RUN goss -g /tests/php-fpm/7.4.goss.yaml validate && /aufs_hack.sh
 
 # Layer local code into runtime
 COPY ./ /app/
@@ -208,14 +208,15 @@ PHP_FPM_LOG_BUFFERING | PHP_FPM_LOG_BUFFERING=no | yes | Experimental, PHP 7.3-o
 
 ### Testing
 ---
-- Requires `docker` and `docker-compose`
+- Requires `docker`, `docker-compose`, and `dgoss`
+
+To test locally, run `PHP_VARIANT=7.4 ./test.sh {docker engine IP}`.
 
-To test locally, run `bash -e ./test.sh {docker-machine}` where `docker-machine` is the IP of the connected docker engine.
 This will:
-- Build all variants and engine versions.
-- [Goss](https://goss.rocks) runs at the end of each container build, confirming package, config, and extension installation.
-- Run each built container, check the default output from its live service.
-- Perform a large file upload
+- Build a single container `PHP_VARIANT` (7.0, 7.1, 7.2, 7.3, 7.3-alpine, 7.4)
+- Leverages [Goss](https://goss.rocks) to confirm package, config, and extension installation
+- Validates a large file upload
+- Boots container with specific NewRelic configuration overrides
 
-These same tests get run automatically, per pull request, via Travis CI
+The test matrix is run automatically per pull request on Travis CI.
 

…/root/tests/php-fpm/7.2-alpine.goss.yaml …/root/tests/php-fpm/7.3-alpine.goss.yamlcontainer/root/tests/php-fpm/7.2-alpine.goss.yaml renamed to container/root/tests/php-fpm/7.3-alpine.goss.yaml container/root/tests/php-fpm/7.2-alpine.goss.yaml renamed to container/root/tests/php-fpm/7.3-alpine.goss.yaml

@@ -8,10 +8,10 @@ command:
     stdout: [7]
   php -r 'echo PHP_MINOR_VERSION;':
     exit-status: 0
-    stdout: [2]
+    stdout: [3]
   php-fpm7 -m:
     exit-status: 0
     stderr: ['!/./']
   php-fpm7 -v:
     exit-status: 0
-    stdout: [PHP 7.2]
+    stdout: [PHP 7.3]