Misc improvements

danog · Jun 2, 2023 · 3d4094f · 3d4094f
1 parent d5d84dd
commit 3d4094f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/docs b/docs
diff --git a/tests/docker.sh b/tests/docker.sh
@@ -11,7 +11,7 @@ if ping -c 1 192.168.69.206; then
 fi
 
 has_x86=0
-for f in 192.168.69.236 192.168.69.207; do
+for f in 192.168.1.30 192.168.69.236 192.168.69.207; do
 	if ping -c 1 $f; then
 		docker buildx create --append --name wp --driver remote tcp://$f:1234
 		has_x86=1

diff --git a/tests/dockerfiles/Dockerfile.alpine b/tests/dockerfiles/Dockerfile.alpine
@@ -12,17 +12,9 @@ RUN apk add make g++ && \
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
 RUN chmod +x /usr/local/bin/install-php-extensions && \
-    install-php-extensions ffi pq ev-beta eio-beta intl gmp mbstring pdo_mysql xml dom curl zip opcache && \
+    install-php-extensions ffi pq ev-beta eio-beta intl gmp mbstring pdo_mysql xml dom zip opcache && \
     rm /usr/local/bin/install-php-extensions
 
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
-    php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
-    php composer-setup.php && \
-    php -r "unlink('composer-setup.php');" && \
-    mv composer.phar /usr/local/bin/composer
-
-RUN apk add --no-cache nano unzip
-
 ADD ./tests/dockerfiles/php.ini /usr/local/etc/php/php.ini
 
 WORKDIR /app