Merge pull request #175 from bryanlatten/feature-dev-cleanup

Dockerfile: making use of (now) available pkgs

Author: bryanlatten

Dockerfile-7.0

@@ -78,28 +78,30 @@ RUN apt-get update -q && \
         php7.0-bcmath \
         php7.0-bz2 \
         php7.0-curl \
-        php7.0-dev \
         php7.0-fpm \
         php7.0-gd \
         php7.0-igbinary \
         php7.0-intl \
         php7.0-json \
         php7.0-mbstring \
         php7.0-mcrypt \
-        php7.0-pgsql \
         php7.0-memcache \
         php7.0-memcached \
-        php7.0-mysql \
+        php7.0-pgsql \
+        php7.0-redis \
         php7.0-xdebug \
-        php7.0-yaml \
         php7.0-xml \
+        php7.0-yaml \
         php7.0-zip \
         newrelic-php5 \
         newrelic-php5-common \
         newrelic-daemon \
+        # Order of operations issue is preventing this from being installed in alphabetical order
+        php7.0-mysql \
     && \
     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
@@ -109,15 +111,11 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20170718 && \
     rm -rf /usr/lib/php/20180731 && \
     rm -rf /usr/lib/php/20190902 && \
+    # Remove unused agents for other PHP versions
+    cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20151012.so | xargs rm && \
+    cd / && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # Install new PHP7-stable version of Redis \
-    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 \
-        php7.0-dev \
-    && \
     /bin/bash /clean.sh
 
 # Overlay the root filesystem from this repo

Dockerfile-7.1

@@ -78,18 +78,20 @@ RUN apt-get update -q && \
         php7.1-bcmath \
         php7.1-bz2 \
         php7.1-curl \
-        php7.1-dev \
         php7.1-fpm \
         php7.1-gd \
         php7.1-igbinary \
         php7.1-intl \
         php7.1-json \
         php7.1-mbstring \
+        php7.1-memcache \
+        php7.1-memcached \
+        php7.1-msgpack \
         php7.1-mcrypt \
         php7.1-mysql \
         php7.1-pgsql \
-        php7.1-memcache \
-        php7.1-memcached \
+        php7.1-redis \
+        php7.1-xdebug \
         php7.1-xml \
         php7.1-yaml \
         php7.1-zip \
@@ -100,6 +102,7 @@ RUN apt-get update -q && \
     && \
     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
@@ -109,16 +112,11 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20170718 && \
     rm -rf /usr/lib/php/20180731 && \
     rm -rf /usr/lib/php/20190902 && \
+    # Remove unused agents for other PHP versions
+    cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20160303.so | xargs rm && \
+    cd / && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # 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 \
-    && \
     /bin/bash /clean.sh
 
 # Overlay the root filesystem from this repo

Dockerfile-7.2

@@ -78,7 +78,6 @@ RUN apt-get update -q && \
         php7.2-bcmath \
         php7.2-bz2 \
         php7.2-curl \
-        php7.2-dev \
         php7.2-fpm \
         php7.2-gd \
         php7.2-igbinary \
@@ -90,16 +89,18 @@ RUN apt-get update -q && \
         php7.2-msgpack \
         php7.2-mysql \
         php7.2-pgsql \
+        php7.2-redis \
+        php7.2-xdebug \
         php7.2-xml \
         php7.2-yaml \
         php7.2-zip \
-        php-xdebug \
         newrelic-php5 \
         newrelic-php5-common \
         newrelic-daemon \
     && \
     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
@@ -109,16 +110,11 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20160303 && \
     rm -rf /usr/lib/php/20180731 && \
     rm -rf /usr/lib/php/20190902 && \
+    # Remove unused agents for other PHP versions
+    cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20170718.so | xargs rm && \
+    cd / && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # 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 \
-    && \
     /bin/bash /clean.sh
 
 # Overlay the root filesystem from this repo

Dockerfile-7.3

@@ -78,7 +78,6 @@ RUN apt-get update -q && \
         php7.3-bcmath \
         php7.3-bz2 \
         php7.3-curl \
-        php7.3-dev \
         php7.3-fpm \
         php7.3-gd \
         php7.3-igbinary \
@@ -90,16 +89,18 @@ RUN apt-get update -q && \
         php7.3-msgpack \
         php7.3-mysql \
         php7.3-pgsql \
+        php7.3-redis \
+        php7.3-xdebug \
         php7.3-xml \
         php7.3-yaml \
         php7.3-zip \
-        php-xdebug \
         newrelic-php5 \
         newrelic-php5-common \
         newrelic-daemon \
     && \
     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
@@ -109,16 +110,11 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20160303 && \
     rm -rf /usr/lib/php/20170718 && \
     rm -rf /usr/lib/php/20190902 && \
+    # Remove unused agents for other PHP versions
+    cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20180731.so | xargs rm && \
+    cd / && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # 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 \
-    && \
     /bin/bash /clean.sh
 
 # Overlay the root filesystem from this repo

Dockerfile-7.4

@@ -77,32 +77,34 @@ RUN apt-get update -q && \
     && \
     apt-get -yqq install \
         php7.4 \
+        php7.4-apcu \
         php7.4-bcmath \
         php7.4-bz2 \
         php7.4-curl \
-        php7.4-dev \
         php7.4-fpm \
         php7.4-gd \
+        php7.4-igbinary \
         php7.4-intl \
         php7.4-json \
         php7.4-mbstring \
         php7.4-memcache \
+        php7.4-memcached \
+        php7.4-msgpack \
         php7.4-mysql \
         php7.4-pgsql \
+        php7.4-redis \
         php7.4-xdebug \
         php7.4-xml \
+        php7.4-yaml \
         php7.4-zip \
         newrelic-php5 \
         newrelic-php5-common \
         newrelic-daemon \
-        # Temporary tweaks to support 7.4-beta
-        libmemcached-dev \
-        pkg-config \
-        zlib1g-dev \
-        libyaml-dev \
     && \
     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
     rm -rf /usr/lib/php/20121212 && \
@@ -112,27 +114,11 @@ RUN apt-get update -q && \
     rm -rf /usr/lib/php/20170718 && \
     rm -rf /usr/lib/php/20180731 && \
     rm -rf /usr/lib/php/7.3 && \
+    # Remove unused agents for other PHP versions
+    cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20190902.so | xargs rm && \
+    cd / && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
-    # Install new stable versions of non-packaged extensions
-    pecl-install \
-        apcu \
-        igbinary \
-        redis \
-        # memcache \
-        memcached \
-        msgpack \
-        yaml \
-    && \
-    phpenmod apcu igbinary memcached msgpack && \
-    # Remove dev packages that were only in place just to compile extensions
-    apt-get remove --purge -yq \
-        php7.4-dev \
-        build-essential \
-        cpp \
-        cpp-7 \
-        gcc \
-    && \
     /bin/bash /clean.sh
 
 # Overlay the root filesystem from this repo

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

@@ -146,8 +146,8 @@ command:
   php -n -d extension=pdo.so -d extension=pdo_pgsql.so -m | grep pdo_pgsql:
     exit-status: 0
     stderr: ['!/./']
-  # On some variants, session is not loaded as part of the core, and must be loaded at this time
-  php -n -d extension=session.so -d extension=json.so -d extension=redis.so -m | grep redis:
+  # On some variants session, json, and igbinary are interwound - only create additive extension directives
+  php extension=redis.so -m | grep redis:
     exit-status: 0
     # On session-default installs, re-loading session causes a warning, ignore
     # stderr: ['!/./']