diff --git a/apps/list.json b/apps/list.json index 72dadddb..1bfba25b 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 eed3af6f..5cdb9df9 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 75246ffb..3ae0a636 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 6e019077..7125a2f4 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 75246ffb..3ae0a636 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 6e019077..7125a2f4 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 eed3af6f..5cdb9df9 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 75246ffb..3ae0a636 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 1e6b4447..4cfa6f14 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 6e019077..7125a2f4 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