From 9de219a82c1054364e5934bfb4585e06a91c1090 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Wed, 22 Mar 2023 14:17:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20phpmyadmin=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=B0=205.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/halo/versions/2.2.0/config.json | 1 - apps/halo/versions/2.2.0/docker-compose.yml | 6 ++++++ apps/halo/versions/2.3.2/config.json | 1 - apps/halo/versions/2.3.2/docker-compose.yml | 6 ++++++ apps/list.json | 2 +- apps/phpmyadmin/versions/{5.2.0 => 5.2.1}/README.md | 0 apps/phpmyadmin/versions/5.2.1/conf.d/uploads.ini | 9 +++++++++ apps/phpmyadmin/versions/{5.2.0 => 5.2.1}/config.json | 0 .../versions/{5.2.0 => 5.2.1}/docker-compose.yml | 5 +++-- apps/wikijs/versions/2.5.298/config.json | 4 ---- 10 files changed, 25 insertions(+), 9 deletions(-) rename apps/phpmyadmin/versions/{5.2.0 => 5.2.1}/README.md (100%) create mode 100644 apps/phpmyadmin/versions/5.2.1/conf.d/uploads.ini rename apps/phpmyadmin/versions/{5.2.0 => 5.2.1}/config.json (100%) rename apps/phpmyadmin/versions/{5.2.0 => 5.2.1}/docker-compose.yml (72%) diff --git a/apps/halo/versions/2.2.0/config.json b/apps/halo/versions/2.2.0/config.json index 85751fe4..47ec17ac 100644 --- a/apps/halo/versions/2.2.0/config.json +++ b/apps/halo/versions/2.2.0/config.json @@ -70,7 +70,6 @@ "labelEn": "Admin Username", "required": true, "default": "admin", - "random": true, "rule": "paramCommon", "envKey": "HALO_ADMIN" }, diff --git a/apps/halo/versions/2.2.0/docker-compose.yml b/apps/halo/versions/2.2.0/docker-compose.yml index e6d0d201..72ef00af 100644 --- a/apps/halo/versions/2.2.0/docker-compose.yml +++ b/apps/halo/versions/2.2.0/docker-compose.yml @@ -10,6 +10,12 @@ services: - ./data:/root/.halo2 ports: - ${PANEL_APP_PORT_HTTP}:8090 + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8090/actuator/health/readiness" ] + interval: 30s + timeout: 5s + retries: 5 + start_period: 30s command: - --spring.r2dbc.url=r2dbc:pool:${HALO_PLATFORM}://${PANEL_DB_HOST}:${HALO_DB_PORT}/${PANEL_DB_NAME} - --spring.r2dbc.username=${PANEL_DB_USER} diff --git a/apps/halo/versions/2.3.2/config.json b/apps/halo/versions/2.3.2/config.json index 85751fe4..47ec17ac 100644 --- a/apps/halo/versions/2.3.2/config.json +++ b/apps/halo/versions/2.3.2/config.json @@ -70,7 +70,6 @@ "labelEn": "Admin Username", "required": true, "default": "admin", - "random": true, "rule": "paramCommon", "envKey": "HALO_ADMIN" }, diff --git a/apps/halo/versions/2.3.2/docker-compose.yml b/apps/halo/versions/2.3.2/docker-compose.yml index e40d0b96..3d4f5409 100644 --- a/apps/halo/versions/2.3.2/docker-compose.yml +++ b/apps/halo/versions/2.3.2/docker-compose.yml @@ -10,6 +10,12 @@ services: - ./data:/root/.halo2 ports: - ${PANEL_APP_PORT_HTTP}:8090 + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8090/actuator/health/readiness" ] + interval: 30s + timeout: 5s + retries: 5 + start_period: 30s command: - --spring.r2dbc.url=r2dbc:pool:${HALO_PLATFORM}://${PANEL_DB_HOST}:${HALO_DB_PORT}/${PANEL_DB_NAME} - --spring.r2dbc.username=${PANEL_DB_USER} diff --git a/apps/list.json b/apps/list.json index a92d627c..2b6bd60f 100644 --- a/apps/list.json +++ b/apps/list.json @@ -101,7 +101,7 @@ "key": "phpmyadmin", "name": "phpMyAdmin", "tags": ["Tool"], - "versions": ["5.2.0"], + "versions": ["5.2.1"], "shortDescZh": "MySQL 数据库管理工具", "shortDescEn": "MySQL database management tools", "type": "tool", diff --git a/apps/phpmyadmin/versions/5.2.0/README.md b/apps/phpmyadmin/versions/5.2.1/README.md similarity index 100% rename from apps/phpmyadmin/versions/5.2.0/README.md rename to apps/phpmyadmin/versions/5.2.1/README.md diff --git a/apps/phpmyadmin/versions/5.2.1/conf.d/uploads.ini b/apps/phpmyadmin/versions/5.2.1/conf.d/uploads.ini new file mode 100644 index 00000000..5b07c5b9 --- /dev/null +++ b/apps/phpmyadmin/versions/5.2.1/conf.d/uploads.ini @@ -0,0 +1,9 @@ +file_uploads = On + +memory_limit = 64M + +upload_max_filesize = 64M + +post_max_size = 64M + +max_execution_time = 600 \ No newline at end of file diff --git a/apps/phpmyadmin/versions/5.2.0/config.json b/apps/phpmyadmin/versions/5.2.1/config.json similarity index 100% rename from apps/phpmyadmin/versions/5.2.0/config.json rename to apps/phpmyadmin/versions/5.2.1/config.json diff --git a/apps/phpmyadmin/versions/5.2.0/docker-compose.yml b/apps/phpmyadmin/versions/5.2.1/docker-compose.yml similarity index 72% rename from apps/phpmyadmin/versions/5.2.0/docker-compose.yml rename to apps/phpmyadmin/versions/5.2.1/docker-compose.yml index 23dc12b4..81e98e16 100644 --- a/apps/phpmyadmin/versions/5.2.0/docker-compose.yml +++ b/apps/phpmyadmin/versions/5.2.1/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: phpmyadmin: - image: phpmyadmin/phpmyadmin:5.2.0 + image: phpmyadmin/phpmyadmin:5.2.1 container_name: ${CONTAINER_NAME} restart: always ports: @@ -10,9 +10,10 @@ services: - PMA_HOST=${PANEL_DB_HOST} networks: - 1panel-network + volumes: + - ./conf.d/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/apps/wikijs/versions/2.5.298/config.json b/apps/wikijs/versions/2.5.298/config.json index 194d0432..5181fcc8 100644 --- a/apps/wikijs/versions/2.5.298/config.json +++ b/apps/wikijs/versions/2.5.298/config.json @@ -7,10 +7,6 @@ "required": true, "default": "postgresql", "values": [ - { - "label": "PostgreSQL", - "value": "postgresql" - }, { "label": "MySQL", "value": "mysql"