Merge pull request #335 from WyriHaximusNet/make-sure-after-removing-PHPIZE_DEPS-we-still-have-git-and-make

Make sure after removing $PHPIZE_DEPS we still have git and make

Author: WyriHaximus

Dockerfile-nts-alpine

@@ -88,6 +88,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
     && docker-php-ext-enable --ini-name zzzzz-event.ini event \
     && docker-php-ext-enable uv \
     && apk del $PHPIZE_DEPS \
+    && apk add --no-cache make git \
     && wget -q -O - https://raw.githubusercontent.com/eficode/wait-for/master/wait-for > /bin/wait-for \
     && chmod +x /bin/wait-for \
     && rm -rf /var/cache/apk/* \

Dockerfile-zts-alpine

@@ -93,6 +93,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
     && docker-php-ext-enable --ini-name zzzzz-event.ini event \
     && docker-php-ext-enable uv \
     && apk del $PHPIZE_DEPS \
+    && apk add --no-cache make git \
     && wget -q -O - https://raw.githubusercontent.com/eficode/wait-for/master/wait-for > /bin/wait-for \
     && chmod +x /bin/wait-for \
     && rm -rf /var/cache/apk/* \

test/container/test_in_docker.py

@@ -11,7 +11,8 @@ def test_in_docker_file_exists(host):
     output = host.run('php -r "exit(file_exists(\'/.you-are-in-a-wyrihaximus.net-php-docker-image-dev\') ? 0 : 255);"')
     assert output.rc == 0
 
-@pytest.mark.php_dev
+@pytest.mark.php_zts
+@pytest.mark.php_nts
 def test_make_works(host):
     output = host.run('make')
     assert output.stdout == ''