Merge pull request #112 from WyriHaximusNet/remove-meminfo

Remove ext-meminfo

Author: WyriHaximus

Dockerfile-nts

@@ -13,21 +13,6 @@ RUN git fetch \
     cp "$EXTENSION_DIR/uv.so" /uv.so
 RUN sha256sum /uv.so
 
-## Build ext-meminfo
-FROM php:7.4-cli-alpine3.11 AS build-meminfo
-RUN apk update && \
-    apk add --no-cache $PHPIZE_DEPS git libuv-dev && \
-    git clone https://github.com/tony2001/php-meminfo.git && \
-    cd php-meminfo && \
-    git checkout -b php74_support origin/php74_support
-WORKDIR /php-meminfo/extension/php7
-RUN phpize
-RUN ./configure --enable-meminfo
-RUN make install
-RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
-    cp "$EXTENSION_DIR/meminfo.so" /meminfo.so
-RUN sha256sum /meminfo.so
-
 FROM php:7.4-cli-alpine3.11 AS nts-root
 
 # Build-time metadata as defined at http://label-schema.org
@@ -98,15 +83,7 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/ /usr/local/bin/
 
-RUN true
-# Copy in meminfo extension
-COPY --from=build-meminfo /meminfo.so /meminfo.so
-RUN true
-
-RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` \
-    && mv /*.so "$EXTENSION_DIR/" \
-    && if [ $(php -v | grep 7.4 | wc -l) != 0 ] ; then rm "$EXTENSION_DIR/meminfo.so"; else docker-php-ext-enable meminfo; fi \
-    && apk add --no-cache \
+RUN apk add --no-cache \
         make \
         git \
         openssh-client \

Dockerfile-zts

@@ -13,21 +13,6 @@ RUN git fetch \
     cp "$EXTENSION_DIR/uv.so" /uv.so
 RUN sha256sum /uv.so
 
-## Build ext-meminfo
-FROM php:7.4-zts-alpine3.11 AS build-meminfo
-RUN apk update && \
-    apk add --no-cache $PHPIZE_DEPS git libuv-dev && \
-    git clone https://github.com/tony2001/php-meminfo.git && \
-    cd php-meminfo && \
-    git checkout -b php74_support origin/php74_support
-WORKDIR /php-meminfo/extension/php7
-RUN phpize
-RUN ./configure --enable-meminfo
-RUN make install
-RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
-    cp "$EXTENSION_DIR/meminfo.so" /meminfo.so
-RUN sha256sum /meminfo.so
-
 FROM php:7.4-zts-alpine3.11 AS zts-root
 
 # Build-time metadata as defined at http://label-schema.org
@@ -105,15 +90,7 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/ /usr/local/bin/
 
-RUN true
-# Copy in meminfo extension
-COPY --from=build-meminfo /meminfo.so /meminfo.so
-RUN true
-
-RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` \
-    && mv /*.so "$EXTENSION_DIR/" \
-    && if [ $(php -v | grep 7.4 | wc -l) != 0 ] ; then rm "$EXTENSION_DIR/meminfo.so"; else docker-php-ext-enable meminfo; fi \
-    && apk add --no-cache \
+RUN apk add --no-cache \
         make \
         git \
         openssh-client \

test/container/functional/meminfo.php

@@ -21,19 +21,3 @@ def test_configuration_is_not_effective(host):
     configuration = host.run('php -i').stdout
 
     assert u'expose_php => Off => Off' in configuration
-
-@pytest.mark.php_dev
-def test_php_meminfo_is_enabled(host):
-    output = host.run('if [ $(php -v | grep 7.4 | wc -l) != 0 ] ; then php -r "echo(\'meminfo\');"; else php -r "exit(function_exists(\'meminfo_dump\') ? 0 : 255);"; fi')
-    assert output.rc == 0
-
-@pytest.mark.php_no_dev
-def test_php_meminfo_is_not_enabled(host):
-    output = host.run('php -r "exit(function_exists(\'meminfo_dump\') ? 0 : 255);"')
-    assert output.rc == 255
-
-@pytest.mark.php_dev
-def test_php_ext_meminfo_is_functional(host):
-    output = host.run('if [ $(php -v | grep 7.4 | wc -l) != 0 ] ; then php -r "echo(\'meminfo\');"; else php /tests/container/functional/meminfo.php; fi')
-    assert output.stdout == 'meminfo'
-    assert output.rc == 0

test/container/test_php_dev.py

@@ -20,10 +20,6 @@ def test_gmp_is_loaded(host):
 def test_iconv_is_loaded(host):
     assert 'iconv' in host.run('php -m').stdout
 
-@pytest.mark.php_dev
-def test_meminfo_is_loaded(host):
-    assert 'meminfo' in host.run('if [ $(php -v | grep 7.4 | wc -l) != 0 ] ; then echo "meminfo"; else php -m; fi').stdout
-
 @pytest.mark.php_zts
 def test_parallel_is_loaded(host):
     assert 'parallel' in host.run('php -m').stdout