diff --git a/.hadolint.yaml b/.hadolint.yaml index b89ea081..9e900c9a 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -7,6 +7,4 @@ ignored: - DL3019 - SC2006 - DL3013 # So we can install the latest docker-compose - - SC2126 - - DL4006 - DL3003 \ No newline at end of file diff --git a/Dockerfile-nts b/Dockerfile-nts index 02c516a6..cd312432 100644 --- a/Dockerfile-nts +++ b/Dockerfile-nts @@ -104,7 +104,7 @@ 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 \ + && docker-php-ext-enable meminfo \ && apk add --no-cache \ make \ git \ diff --git a/Dockerfile-zts b/Dockerfile-zts index b513dfd0..03573065 100644 --- a/Dockerfile-zts +++ b/Dockerfile-zts @@ -125,7 +125,7 @@ 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 \ + && docker-php-ext-enable meminfo \ && apk add --no-cache \ make \ git \ diff --git a/test/container/test_php_dev.py b/test/container/test_php_dev.py index 1544ba42..c6b05ced 100644 --- a/test/container/test_php_dev.py +++ b/test/container/test_php_dev.py @@ -24,7 +24,7 @@ def test_configuration_is_not_effective(host): @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') + output = host.run('php -r "exit(function_exists(\'meminfo_dump\') ? 0 : 255);"') assert output.rc == 0 @pytest.mark.php_no_dev @@ -34,6 +34,6 @@ def test_php_meminfo_is_not_enabled(host): @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') + output = host.run('php /tests/container/functional/meminfo.php') assert output.stdout == 'meminfo' assert output.rc == 0 diff --git a/test/container/test_php_ext.py b/test/container/test_php_ext.py index 980f0bf8..4e678fde 100644 --- a/test/container/test_php_ext.py +++ b/test/container/test_php_ext.py @@ -22,7 +22,7 @@ def test_iconv_is_loaded(host): @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 + assert 'meminfo' in host.run('php -m').stdout @pytest.mark.php_zts def test_parallel_is_loaded(host):