From f05ec04cad7e37e2977facdc7ecd17a585cf0956 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Thu, 29 Jun 2023 11:34:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20PHP=20=E6=89=A9=E5=B1=95=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E9=BB=98=E8=AE=A4=E5=A2=9E=E5=8A=A0=20imagick=20(#168?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/php7/7.0.33/build/config.json            |  4 +++
 .../7.0.33/build/php/extensions/install.sh    |  5 ++++
 apps/php7/7.1.33/build/config.json            |  4 +++
 .../7.1.33/build/php/extensions/install.sh    |  5 ++++
 apps/php7/7.2.34/build/config.json            |  4 +++
 .../7.2.34/build/php/extensions/install.sh    |  6 +++-
 apps/php7/7.3.33/build/config.json            |  4 +++
 .../7.3.33/build/php/extensions/install.sh    |  5 ++++
 apps/php7/7.4.33/build/config.json            |  4 +++
 .../7.4.33/build/php/extensions/install.sh    |  5 ++++
 apps/php8/8.0.28/build/config.json            |  4 +++
 .../8.0.28/build/php/extensions/install.sh    | 27 +++++++++++-------
 apps/php8/8.1.18/build/config.json            |  4 +++
 .../8.1.18/build/php/extensions/install.sh    | 28 ++++++++++++-------
 apps/php8/8.2.5/build/config.json             |  4 +++
 .../8.2.5/build/php/extensions/install.sh     | 27 +++++++++++-------
 16 files changed, 109 insertions(+), 31 deletions(-)

diff --git a/apps/php7/7.0.33/build/config.json b/apps/php7/7.0.33/build/config.json
index bd0f9e83..e2e5d85d 100644
--- a/apps/php7/7.0.33/build/config.json
+++ b/apps/php7/7.0.33/build/config.json
@@ -121,6 +121,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php7/7.0.33/build/php/extensions/install.sh b/apps/php7/7.0.33/build/php/extensions/install.sh
index 8ad09f52..7e2f5fed 100644
--- a/apps/php7/7.0.33/build/php/extensions/install.sh
+++ b/apps/php7/7.0.33/build/php/extensions/install.sh
@@ -83,6 +83,11 @@ if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
     echo "---------- Install imagick ----------"
 	  install-php-extensions imagick
 fi
+
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
 # end
 
 
diff --git a/apps/php7/7.1.33/build/config.json b/apps/php7/7.1.33/build/config.json
index bd0f9e83..e2e5d85d 100644
--- a/apps/php7/7.1.33/build/config.json
+++ b/apps/php7/7.1.33/build/config.json
@@ -121,6 +121,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php7/7.1.33/build/php/extensions/install.sh b/apps/php7/7.1.33/build/php/extensions/install.sh
index 8ad09f52..7e2f5fed 100644
--- a/apps/php7/7.1.33/build/php/extensions/install.sh
+++ b/apps/php7/7.1.33/build/php/extensions/install.sh
@@ -83,6 +83,11 @@ if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
     echo "---------- Install imagick ----------"
 	  install-php-extensions imagick
 fi
+
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
 # end
 
 
diff --git a/apps/php7/7.2.34/build/config.json b/apps/php7/7.2.34/build/config.json
index bd0f9e83..e2e5d85d 100644
--- a/apps/php7/7.2.34/build/config.json
+++ b/apps/php7/7.2.34/build/config.json
@@ -121,6 +121,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php7/7.2.34/build/php/extensions/install.sh b/apps/php7/7.2.34/build/php/extensions/install.sh
index 8ad09f52..1034f812 100644
--- a/apps/php7/7.2.34/build/php/extensions/install.sh
+++ b/apps/php7/7.2.34/build/php/extensions/install.sh
@@ -83,8 +83,12 @@ if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
     echo "---------- Install imagick ----------"
 	  install-php-extensions imagick
 fi
-# end
 
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
+# end
 
 if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then
     echo "---------- Install pdo_mysql ----------"
diff --git a/apps/php7/7.3.33/build/config.json b/apps/php7/7.3.33/build/config.json
index bd0f9e83..e2e5d85d 100644
--- a/apps/php7/7.3.33/build/config.json
+++ b/apps/php7/7.3.33/build/config.json
@@ -121,6 +121,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php7/7.3.33/build/php/extensions/install.sh b/apps/php7/7.3.33/build/php/extensions/install.sh
index 8ad09f52..7e2f5fed 100644
--- a/apps/php7/7.3.33/build/php/extensions/install.sh
+++ b/apps/php7/7.3.33/build/php/extensions/install.sh
@@ -83,6 +83,11 @@ if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
     echo "---------- Install imagick ----------"
 	  install-php-extensions imagick
 fi
+
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
 # end
 
 
diff --git a/apps/php7/7.4.33/build/config.json b/apps/php7/7.4.33/build/config.json
index bd0f9e83..e2e5d85d 100644
--- a/apps/php7/7.4.33/build/config.json
+++ b/apps/php7/7.4.33/build/config.json
@@ -121,6 +121,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php7/7.4.33/build/php/extensions/install.sh b/apps/php7/7.4.33/build/php/extensions/install.sh
index 8ad09f52..7e2f5fed 100644
--- a/apps/php7/7.4.33/build/php/extensions/install.sh
+++ b/apps/php7/7.4.33/build/php/extensions/install.sh
@@ -83,6 +83,11 @@ if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
     echo "---------- Install imagick ----------"
 	  install-php-extensions imagick
 fi
+
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
 # end
 
 
diff --git a/apps/php8/8.0.28/build/config.json b/apps/php8/8.0.28/build/config.json
index 50cf5775..4906dcf8 100644
--- a/apps/php8/8.0.28/build/config.json
+++ b/apps/php8/8.0.28/build/config.json
@@ -117,6 +117,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php8/8.0.28/build/php/extensions/install.sh b/apps/php8/8.0.28/build/php/extensions/install.sh
index 8a3bbbaf..c8e284a6 100644
--- a/apps/php8/8.0.28/build/php/extensions/install.sh
+++ b/apps/php8/8.0.28/build/php/extensions/install.sh
@@ -72,6 +72,23 @@ installExtensionFromTgz()
     docker-php-ext-enable ${extensionName}
 }
 
+# install use  install-php-extensions
+if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then
+    echo "---------- Install ioncube_loader ----------"
+	  install-php-extensions ioncube_loader
+fi
+
+if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
+    echo "---------- Install imagick ----------"
+	  install-php-extensions imagick
+fi
+
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
+# end
+
 
 if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then
     echo "---------- Install pdo_mysql ----------"
@@ -208,16 +225,6 @@ if [[ -z "${EXTENSIONS##*,hprose,*}" ]]; then
     docker-php-ext-enable hprose
 fi
 
-if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then
-    echo "---------- Install ioncube_loader ----------"
-	  install-php-extensions ioncube_loader
-fi
-
-if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
-    echo "---------- Install imagick ----------"
-	  install-php-extensions imagick
-fi
-
 if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
     echo "---------- Install gd ----------"
     isPhpVersionGreaterOrEqual 8 0
diff --git a/apps/php8/8.1.18/build/config.json b/apps/php8/8.1.18/build/config.json
index 50cf5775..4906dcf8 100644
--- a/apps/php8/8.1.18/build/config.json
+++ b/apps/php8/8.1.18/build/config.json
@@ -117,6 +117,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php8/8.1.18/build/php/extensions/install.sh b/apps/php8/8.1.18/build/php/extensions/install.sh
index 8a3bbbaf..9bf470e3 100644
--- a/apps/php8/8.1.18/build/php/extensions/install.sh
+++ b/apps/php8/8.1.18/build/php/extensions/install.sh
@@ -73,6 +73,24 @@ installExtensionFromTgz()
 }
 
 
+# install use  install-php-extensions
+if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then
+    echo "---------- Install ioncube_loader ----------"
+	  install-php-extensions ioncube_loader
+fi
+
+if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
+    echo "---------- Install imagick ----------"
+	  install-php-extensions imagick
+fi
+
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
+# end
+
+
 if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then
     echo "---------- Install pdo_mysql ----------"
     docker-php-ext-install ${MC} pdo_mysql
@@ -208,16 +226,6 @@ if [[ -z "${EXTENSIONS##*,hprose,*}" ]]; then
     docker-php-ext-enable hprose
 fi
 
-if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then
-    echo "---------- Install ioncube_loader ----------"
-	  install-php-extensions ioncube_loader
-fi
-
-if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
-    echo "---------- Install imagick ----------"
-	  install-php-extensions imagick
-fi
-
 if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
     echo "---------- Install gd ----------"
     isPhpVersionGreaterOrEqual 8 0
diff --git a/apps/php8/8.2.5/build/config.json b/apps/php8/8.2.5/build/config.json
index 50cf5775..4906dcf8 100644
--- a/apps/php8/8.2.5/build/config.json
+++ b/apps/php8/8.2.5/build/config.json
@@ -117,6 +117,10 @@
         {
           "label": "sg11",
           "value": "sourceguardian"
+        },
+        {
+          "label": "imagick",
+          "value": "imagick"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php8/8.2.5/build/php/extensions/install.sh b/apps/php8/8.2.5/build/php/extensions/install.sh
index 8a3bbbaf..c8e284a6 100644
--- a/apps/php8/8.2.5/build/php/extensions/install.sh
+++ b/apps/php8/8.2.5/build/php/extensions/install.sh
@@ -72,6 +72,23 @@ installExtensionFromTgz()
     docker-php-ext-enable ${extensionName}
 }
 
+# install use  install-php-extensions
+if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then
+    echo "---------- Install ioncube_loader ----------"
+	  install-php-extensions ioncube_loader
+fi
+
+if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
+    echo "---------- Install imagick ----------"
+	  install-php-extensions imagick
+fi
+
+if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then
+    echo "---------- Install sourceguardian ----------"
+	  install-php-extensions sourceguardian
+fi
+# end
+
 
 if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then
     echo "---------- Install pdo_mysql ----------"
@@ -208,16 +225,6 @@ if [[ -z "${EXTENSIONS##*,hprose,*}" ]]; then
     docker-php-ext-enable hprose
 fi
 
-if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then
-    echo "---------- Install ioncube_loader ----------"
-	  install-php-extensions ioncube_loader
-fi
-
-if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then
-    echo "---------- Install imagick ----------"
-	  install-php-extensions imagick
-fi
-
 if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
     echo "---------- Install gd ----------"
     isPhpVersionGreaterOrEqual 8 0