From 1198badfe43388588b8c59594794f44eeee7b326 Mon Sep 17 00:00:00 2001
From: erikn69 <erikn_69@hotmail.com>
Date: Mon, 19 Dec 2022 12:47:27 -0500
Subject: [PATCH] Fix tests

---
 .env.example         | 4 ++--
 php-fpm/Dockerfile   | 2 +-
 workspace/Dockerfile | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.env.example b/.env.example
index 730a6346..a9d9bcae 100644
--- a/.env.example
+++ b/.env.example
@@ -212,7 +212,7 @@ WORKSPACE_PROTOC_VERSION=latest
 WORKSPACE_INSTALL_MEMCACHED=true
 WORKSPACE_INSTALL_EVENT=false
 WORKSPACE_INSTALL_DNSUTILS=true
-WORKSPACE_XDEBUG_PORT=9003
+WORKSPACE_XDEBUG_PORT=9000
 WORKSPACE_VITE_PORT=5173
 
 ### PHP_FPM ###############################################
@@ -285,7 +285,7 @@ PHP_FPM_AUDIOWAVEFORM=false
 PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8"
 PHP_FPM_INSTALL_DOCKER_CLIENT=false
 PHP_FPM_DEFAULT_LOCALE=POSIX
-PHP_FPM_XDEBUG_PORT=9003
+PHP_FPM_XDEBUG_PORT=9000
 PHP_FPM_INSTALL_EVENT=false
 PHP_FPM_INSTALL_DNSUTILS=true
 
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d1e3f235..3feda183 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -1286,7 +1286,7 @@ RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
 # Check PHP version:
 ###########################################################################
 
-RUN set -xe; php -v | head -n 1 | grep -q "PHP ${LARADOCK_PHP_VERSION}."
+RUN set -xe; php -v | grep -q "PHP ${LARADOCK_PHP_VERSION}."
 
 #
 #--------------------------------------------------------------------------
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index a4cb4a7b..04e4d72a 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -981,7 +981,7 @@ ARG INSTALL_LARAVEL_ENVOY=false
 
 RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
     # Install the Laravel Envoy
-    composer config --no-plugins allow-plugins.kylekatarnls/update-helper true && \
+    composer global config --no-plugins allow-plugins.kylekatarnls/update-helper true && \
     composer global require laravel/envoy \
 ;fi
 
@@ -1756,7 +1756,7 @@ RUN set -eux; \
       make install &&\
       rm /tmp/libevent.tar.gz &&\
       echo "extension=sockets.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini && \
-      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \
+      ln -sf /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \
       curl -L -o /tmp/event.tar.gz http://pecl.php.net/get/event-3.0.6.tgz &&\
       mkdir -p /tmp/event-php &&\
       tar -C /tmp/event-php -zxvf /tmp/event.tar.gz --strip 1 &&\
@@ -1767,7 +1767,7 @@ RUN set -eux; \
       make install &&\
       rm /tmp/event.tar.gz &&\
       echo "extension=event.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini && \
-      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-event.ini && \
+      ln -sf /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-event.ini && \
       php -m  | grep -q 'event' \
 ;fi