From ae4e2319884877f0599ce09436b1211151cb1f78 Mon Sep 17 00:00:00 2001
From: Erik Niebla <ep_niebla@hotmail.com>
Date: Mon, 28 Mar 2022 11:41:36 -0500
Subject: [PATCH] Fix php-zmq link

---
 php-fpm/Dockerfile    |  2 +-
 php-worker/Dockerfile |  2 +-
 workspace/Dockerfile  | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d6eff7e8..57578ebf 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -1225,7 +1225,7 @@ ARG INSTALL_ZMQ=false
 
 RUN if [ ${INSTALL_ZMQ} = true ]; then \
     apt-get install --yes git libzmq3-dev \
-    && git clone git://github.com/mkoppanen/php-zmq.git \
+    && git clone https://github.com/zeromq/php-zmq.git \
     && cd php-zmq \
     && phpize \
     && ./configure \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 8397681e..ee6d1890 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 ARG LARADOCK_PHP_VERSION
-FROM php:${LARADOCK_PHP_VERSION}-alpine3.15
+FROM php:${LARADOCK_PHP_VERSION}-alpine
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 6a243d5d..90893592 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -331,6 +331,7 @@ ARG INSTALL_XDEBUG=false
 RUN if [ ${INSTALL_XDEBUG} = true ]; then \
   # Install the xdebug extension
   # https://xdebug.org/docs/compat
+  apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
   if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
     pecl install xdebug-3.1.2; \
   else \
@@ -443,6 +444,7 @@ ARG INSTALL_MONGO=false
 
 RUN if [ ${INSTALL_MONGO} = true ]; then \
     # Install the mongodb extension
+    apt-get install -yqq pkg-config && \
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
       pecl install mongo; \
       echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini; \
@@ -543,11 +545,11 @@ ARG INSTALL_SWOOLE=false
 RUN set -eux; \
     if [ ${INSTALL_SWOOLE} = true ]; then \
       # Install Php Swoole Extension
-      if   [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \
+      if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
         echo '' | pecl -q install swoole-2.0.10; \
-      elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \
+      elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
         echo '' | pecl -q install swoole-4.3.5; \
-      elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
+      elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
         echo '' | pecl -q install swoole-4.5.11; \
       else \
         echo '' | pecl -q install swoole; \
@@ -570,7 +572,7 @@ RUN set -eux; \
       if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \
         echo '' | pecl -q install xlswriter && \
         echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini && \
-        ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \
+        ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini && \
         php -m | grep -q 'xlswriter'; \
       else \
         echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \
@@ -1721,7 +1723,7 @@ ARG INSTALL_ZMQ=false
 
 RUN if [ ${INSTALL_ZMQ} = true ]; then \
     apt-get install --yes git libzmq3-dev \
-    && git clone git://github.com/mkoppanen/php-zmq.git \
+    && git clone https://github.com/zeromq/php-zmq.git \
     && cd php-zmq \
     && phpize \
     && ./configure \