From b25fd8747e62e73c29c010743e2ad37464cdd4ee Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 10 Apr 2023 18:35:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20PHP=20=E5=BA=94=E7=94=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20label=20(#20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/list.json                                     | 8 ++++++--
 apps/php5/versions/5.6.40/build/config.json        | 4 ++++
 apps/php5/versions/5.6.40/build/docker-compose.yml | 2 --
 apps/php5/versions/5.6.40/docker-compose.yml       | 2 ++
 apps/php7/versions/7.4.33/build/docker-compose.yml | 2 --
 apps/php7/versions/7.4.33/docker-compose.yml       | 2 ++
 apps/php8/versions/8.2.0/build/config.json         | 4 ++++
 apps/php8/versions/8.2.0/build/docker-compose.yml  | 2 --
 apps/php8/versions/8.2.0/build/php/Dockerfile      | 4 ++--
 apps/php8/versions/8.2.0/docker-compose.yml        | 2 ++
 10 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/apps/list.json b/apps/list.json
index 72dadddb8..1bfba25bf 100644
--- a/apps/list.json
+++ b/apps/list.json
@@ -9,6 +9,10 @@
       "key": "Server",
       "name": "Web 服务器"
     },
+    {
+      "key": "Runtime",
+      "name": "运行环境"
+    },
     {
       "key": "Database",
       "name": "数据库"
@@ -22,8 +26,8 @@
       "name": "CI/CD"
     },
     {
-      "key": "Runtime",
-      "name": "运行环境"
+      "key": "Local",
+      "name": "本地"
     }
   ],
   "items": [
diff --git a/apps/php5/versions/5.6.40/build/config.json b/apps/php5/versions/5.6.40/build/config.json
index eed3af6f9..5cdb9df96 100644
--- a/apps/php5/versions/5.6.40/build/config.json
+++ b/apps/php5/versions/5.6.40/build/config.json
@@ -93,6 +93,10 @@
         {
           "label": "igbinary",
           "value": "igbinary"
+        },
+        {
+          "label": "mysqli",
+          "value": "mysqli"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php5/versions/5.6.40/build/docker-compose.yml b/apps/php5/versions/5.6.40/build/docker-compose.yml
index 75246ffb4..3ae0a6368 100644
--- a/apps/php5/versions/5.6.40/build/docker-compose.yml
+++ b/apps/php5/versions/5.6.40/build/docker-compose.yml
@@ -18,5 +18,3 @@ services:
     restart: always
     cap_add:
       - SYS_PTRACE
-    networks:
-      - default
\ No newline at end of file
diff --git a/apps/php5/versions/5.6.40/docker-compose.yml b/apps/php5/versions/5.6.40/docker-compose.yml
index 6e019077a..7125a2f44 100644
--- a/apps/php5/versions/5.6.40/docker-compose.yml
+++ b/apps/php5/versions/5.6.40/docker-compose.yml
@@ -14,6 +14,8 @@ services:
       - ./composer:/tmp/composer
     ports:
       - ${PANEL_APP_PORT_HTTP}:9000
+    labels:
+      createdBy: "Apps"
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/php7/versions/7.4.33/build/docker-compose.yml b/apps/php7/versions/7.4.33/build/docker-compose.yml
index 75246ffb4..3ae0a6368 100644
--- a/apps/php7/versions/7.4.33/build/docker-compose.yml
+++ b/apps/php7/versions/7.4.33/build/docker-compose.yml
@@ -18,5 +18,3 @@ services:
     restart: always
     cap_add:
       - SYS_PTRACE
-    networks:
-      - default
\ No newline at end of file
diff --git a/apps/php7/versions/7.4.33/docker-compose.yml b/apps/php7/versions/7.4.33/docker-compose.yml
index 6e019077a..7125a2f44 100644
--- a/apps/php7/versions/7.4.33/docker-compose.yml
+++ b/apps/php7/versions/7.4.33/docker-compose.yml
@@ -14,6 +14,8 @@ services:
       - ./composer:/tmp/composer
     ports:
       - ${PANEL_APP_PORT_HTTP}:9000
+    labels:
+      createdBy: "Apps"
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/php8/versions/8.2.0/build/config.json b/apps/php8/versions/8.2.0/build/config.json
index eed3af6f9..5cdb9df96 100644
--- a/apps/php8/versions/8.2.0/build/config.json
+++ b/apps/php8/versions/8.2.0/build/config.json
@@ -93,6 +93,10 @@
         {
           "label": "igbinary",
           "value": "igbinary"
+        },
+        {
+          "label": "mysqli",
+          "value": "mysqli"
         }
       ],
       "envKey": "PHP_EXTENSIONS",
diff --git a/apps/php8/versions/8.2.0/build/docker-compose.yml b/apps/php8/versions/8.2.0/build/docker-compose.yml
index 75246ffb4..3ae0a6368 100644
--- a/apps/php8/versions/8.2.0/build/docker-compose.yml
+++ b/apps/php8/versions/8.2.0/build/docker-compose.yml
@@ -18,5 +18,3 @@ services:
     restart: always
     cap_add:
       - SYS_PTRACE
-    networks:
-      - default
\ No newline at end of file
diff --git a/apps/php8/versions/8.2.0/build/php/Dockerfile b/apps/php8/versions/8.2.0/build/php/Dockerfile
index 1e6b44478..4cfa6f148 100644
--- a/apps/php8/versions/8.2.0/build/php/Dockerfile
+++ b/apps/php8/versions/8.2.0/build/php/Dockerfile
@@ -1,5 +1,5 @@
-ARG PHP_VERSION
-FROM ${PHP_VERSION}
+ARG PHP_IMAGE
+FROM ${PHP_IMAGE}
 
 ARG TZ
 ARG PHP_EXTENSIONS
diff --git a/apps/php8/versions/8.2.0/docker-compose.yml b/apps/php8/versions/8.2.0/docker-compose.yml
index 6e019077a..7125a2f44 100644
--- a/apps/php8/versions/8.2.0/docker-compose.yml
+++ b/apps/php8/versions/8.2.0/docker-compose.yml
@@ -14,6 +14,8 @@ services:
       - ./composer:/tmp/composer
     ports:
       - ${PANEL_APP_PORT_HTTP}:9000
+    labels:
+      createdBy: "Apps"
 networks:
   1panel-network:
     external: true
\ No newline at end of file