diff --git a/adguardhome/0.107.33/docker-compose.yml b/adguardhome/0.107.33/docker-compose.yml index c8d8ca48a..2e38e07a2 100644 --- a/adguardhome/0.107.33/docker-compose.yml +++ b/adguardhome/0.107.33/docker-compose.yml @@ -26,7 +26,6 @@ services: image: adguard/adguardhome:v0.107.33 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/adminer/4.8.1/docker-compose.yml b/adminer/4.8.1/docker-compose.yml index 6cb38b6e3..72a7abf74 100644 --- a/adminer/4.8.1/docker-compose.yml +++ b/adminer/4.8.1/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: adminer: image: adminer:4.8.1-standalone diff --git a/alist/3.21.0/data.yml b/alist/3.21.0/data.yml index 6e7001db8..cdc912e2c 100755 --- a/alist/3.21.0/data.yml +++ b/alist/3.21.0/data.yml @@ -8,17 +8,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data/data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - - default: ./data/mnt - edit: true - envKey: MOUNT_PATH - labelEn: Mount folder path - labelZh: 挂载文件夹路径 - required: true - type: text diff --git a/alist/3.21.0/docker-compose.yml b/alist/3.21.0/docker-compose.yml index fd9c82f7a..1603d776e 100644 --- a/alist/3.21.0/docker-compose.yml +++ b/alist/3.21.0/docker-compose.yml @@ -8,8 +8,8 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:5244" volumes: - - "${DATA_PATH}:/opt/alist/data" - - "${MOUNT_PATH}:/mnt/data" + - ./data/data:/opt/alist/data + - ./data/mnt:/mnt/data environment: - PUID=0 - PGID=0 @@ -17,7 +17,6 @@ services: image: xhofe/alist:v3.21.0 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/bitwarden/1.29.0-alpine/data.yml b/bitwarden/1.29.0-alpine/data.yml index 4812fc505..4bb16e8cf 100644 --- a/bitwarden/1.29.0-alpine/data.yml +++ b/bitwarden/1.29.0-alpine/data.yml @@ -8,10 +8,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text diff --git a/bitwarden/1.29.0-alpine/docker-compose.yml b/bitwarden/1.29.0-alpine/docker-compose.yml index bc4cdf758..8d08119be 100644 --- a/bitwarden/1.29.0-alpine/docker-compose.yml +++ b/bitwarden/1.29.0-alpine/docker-compose.yml @@ -8,11 +8,10 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:80" volumes: - - "${DATA_PATH}:/data" + - ./data:/data image: vaultwarden/server:1.29.0-alpine labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/cloudreve/3.8.0/docker-compose.yml b/cloudreve/3.8.0/docker-compose.yml index fcb02453e..d8abb108e 100644 --- a/cloudreve/3.8.0/docker-compose.yml +++ b/cloudreve/3.8.0/docker-compose.yml @@ -16,7 +16,6 @@ services: image: cloudreve/cloudreve:3.8.0 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/code-server/4.14.1/data.yml b/code-server/4.14.1/data.yml index a5d568077..fe6aaf255 100644 --- a/code-server/4.14.1/data.yml +++ b/code-server/4.14.1/data.yml @@ -8,13 +8,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - default: code envKey: WEB_PASSWORD labelEn: Web access password diff --git a/code-server/4.14.1/docker-compose.yml b/code-server/4.14.1/docker-compose.yml index cd1fcf302..9f7b0090b 100644 --- a/code-server/4.14.1/docker-compose.yml +++ b/code-server/4.14.1/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:8443" volumes: - - "${DATA_PATH}:/config" + - ./data:/config environment: - PUID=1000 - PGID=1000 @@ -19,7 +19,6 @@ services: image: linuxserver/code-server:4.14.1 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/dataease/1.18.8/docker-compose.yml b/dataease/1.18.8/docker-compose.yml index 837d06cc9..b5f0395ce 100644 --- a/dataease/1.18.8/docker-compose.yml +++ b/dataease/1.18.8/docker-compose.yml @@ -25,7 +25,6 @@ services: - 1panel-network labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/ddns-go/5.3.6/data.yml b/ddns-go/5.3.6/data.yml index 38a29666e..3c8c913bb 100644 --- a/ddns-go/5.3.6/data.yml +++ b/ddns-go/5.3.6/data.yml @@ -8,10 +8,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text diff --git a/ddns-go/5.3.6/docker-compose.yml b/ddns-go/5.3.6/docker-compose.yml index 829084e16..12e713b0c 100644 --- a/ddns-go/5.3.6/docker-compose.yml +++ b/ddns-go/5.3.6/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: ddns-go: container_name: ${CONTAINER_NAME} @@ -8,11 +8,10 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:9876" volumes: - - "${DATA_PATH}:/root" + - ./data:/root image: jeessy/ddns-go:v5.3.6 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/docker-registry/2.8.1/docker-compose.yml b/docker-registry/2.8.1/docker-compose.yml index 41baf0e3d..1af0b5306 100644 --- a/docker-registry/2.8.1/docker-compose.yml +++ b/docker-registry/2.8.1/docker-compose.yml @@ -12,7 +12,6 @@ services: - ./data:/var/lib/registry labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/flarum/1.8.0/data.yml b/flarum/1.8.0/data.yml index 1fa9d1fa2..7ef089be7 100755 --- a/flarum/1.8.0/data.yml +++ b/flarum/1.8.0/data.yml @@ -62,13 +62,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data storage folder - labelZh: 数据存放文件夹 - required: true - type: text - default: http://localhost:40020 edit: true envKey: FLARUM_EXTERNAL_URL diff --git a/flarum/1.8.0/docker-compose.yml b/flarum/1.8.0/docker-compose.yml index 5209e621e..50189fca5 100644 --- a/flarum/1.8.0/docker-compose.yml +++ b/flarum/1.8.0/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: flarum: container_name: ${CONTAINER_NAME} @@ -8,7 +8,7 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:8000" volumes: - - "${DATA_PATH}:/data" + - ./data:/data environment: - TZ=Asia/Shanghai - PUID=1000 @@ -30,7 +30,7 @@ services: - FLARUM_BASE_URL=${FLARUM_EXTERNAL_URL} image: crazymax/flarum:1.8.0 labels: - createdBy: Apps + createdBy: "Apps" networks: 1panel-network: external: true diff --git a/gitea/1.19.3/docker-compose.yml b/gitea/1.19.3/docker-compose.yml index 7aaf3a42e..bd1cceaf0 100644 --- a/gitea/1.19.3/docker-compose.yml +++ b/gitea/1.19.3/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: gitea: image: gitea/gitea:1.19.4 @@ -23,7 +23,6 @@ services: - "${PANEL_APP_PORT_SSH}:22" labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/halo/2.7.0/docker-compose.yml b/halo/2.7.0/docker-compose.yml index 77a3bef88..b626a7d9d 100644 --- a/halo/2.7.0/docker-compose.yml +++ b/halo/2.7.0/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: halo: image: halohub/halo:2.7.0 @@ -26,7 +26,6 @@ services: - --halo.security.initializer.superadminpassword=${HALO_ADMIN_PASSWORD} labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/jellyfin/10.8.10/docker-compose.yml b/jellyfin/10.8.10/docker-compose.yml index 1b21e83a3..9037f6582 100644 --- a/jellyfin/10.8.10/docker-compose.yml +++ b/jellyfin/10.8.10/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: jellyfin: container_name: ${CONTAINER_NAME} @@ -14,7 +14,6 @@ services: image: "jellyfin/jellyfin:10.8.10" labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/jenkins/2.414/docker-compose.yml b/jenkins/2.414/docker-compose.yml index 3b2bdf682..1fe5f6b14 100644 --- a/jenkins/2.414/docker-compose.yml +++ b/jenkins/2.414/docker-compose.yml @@ -16,7 +16,6 @@ services: - 1panel-network labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/kubepi/1.6.4/docker-compose.yml b/kubepi/1.6.4/docker-compose.yml index 711526931..1543f5b3b 100644 --- a/kubepi/1.6.4/docker-compose.yml +++ b/kubepi/1.6.4/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: kubepi: image: kubeoperator/kubepi-server:v1.6.4 @@ -13,7 +13,6 @@ services: privileged: true labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/lsky-pro/latest/data.yml b/lsky-pro/latest/data.yml index bbc3f4e1e..4f86dac53 100644 --- a/lsky-pro/latest/data.yml +++ b/lsky-pro/latest/data.yml @@ -8,10 +8,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text diff --git a/lsky-pro/latest/docker-compose.yml b/lsky-pro/latest/docker-compose.yml index d916808a2..2201a4fdd 100644 --- a/lsky-pro/latest/docker-compose.yml +++ b/lsky-pro/latest/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: lskypro: container_name: ${CONTAINER_NAME} @@ -6,7 +6,7 @@ services: networks: - 1panel-network volumes: - - "${DATA_PATH}:/var/www/html/" + - ./data:/var/www/html/ ports: - "${PANEL_APP_PORT_HTTP}:8089" environment: @@ -14,7 +14,6 @@ services: image: halcyonazure/lsky-pro-docker:latest labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/mariadb/10.11.4/docker-compose.yml b/mariadb/10.11.4/docker-compose.yml index 9a1c36d9c..ba5c064fb 100644 --- a/mariadb/10.11.4/docker-compose.yml +++ b/mariadb/10.11.4/docker-compose.yml @@ -14,7 +14,6 @@ services: MYSQL_ROOT_PASSWORD: ${PANEL_DB_ROOT_PASSWORD} labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/mblog/1.0.9/docker-compose.yml b/mblog/1.0.9/docker-compose.yml index e84c675e0..92b93ad3e 100644 --- a/mblog/1.0.9/docker-compose.yml +++ b/mblog/1.0.9/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: halo: image: kingwrcy/mblog:1.0.9 @@ -14,7 +14,6 @@ services: - ${PANEL_APP_PORT_HTTP}:38321 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml b/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml index dac25b2d8..ff0e22adf 100644 --- a/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml +++ b/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml @@ -22,7 +22,6 @@ services: - ./data:/data labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/mongodb/6.0.7/docker-compose.yml b/mongodb/6.0.7/docker-compose.yml index 82bd8eb0f..f22d12215 100644 --- a/mongodb/6.0.7/docker-compose.yml +++ b/mongodb/6.0.7/docker-compose.yml @@ -15,7 +15,6 @@ services: - ./data:/data/db labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/mysql/8.0.33/docker-compose.yml b/mysql/8.0.33/docker-compose.yml index b0f9d23b3..90c537490 100644 --- a/mysql/8.0.33/docker-compose.yml +++ b/mysql/8.0.33/docker-compose.yml @@ -21,7 +21,6 @@ services: createdBy: "Apps" command: - --default-authentication-plugin=mysql_native_password - networks: 1panel-network: external: true diff --git a/nexus/3.57.0/docker-compose.yml b/nexus/3.57.0/docker-compose.yml index 520625ec4..2068a2e68 100644 --- a/nexus/3.57.0/docker-compose.yml +++ b/nexus/3.57.0/docker-compose.yml @@ -14,7 +14,6 @@ services: - 1panel-network labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/nginx-proxy-manager/github-pr-3027/data.yml b/nginx-proxy-manager/github-pr-3027/data.yml index 959fdcc95..46bdf569b 100644 --- a/nginx-proxy-manager/github-pr-3027/data.yml +++ b/nginx-proxy-manager/github-pr-3027/data.yml @@ -24,17 +24,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data/data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - - default: ./data/ssl - edit: true - envKey: SSL_PATH - labelEn: SSL folder path - labelZh: 证书文件夹路径 - required: true - type: text diff --git a/nginx-proxy-manager/github-pr-3027/docker-compose.yml b/nginx-proxy-manager/github-pr-3027/docker-compose.yml index 2d19388e7..7659621fe 100644 --- a/nginx-proxy-manager/github-pr-3027/docker-compose.yml +++ b/nginx-proxy-manager/github-pr-3027/docker-compose.yml @@ -10,12 +10,11 @@ services: - "${PANEL_APP_PORT_HTTP}:81" - "${PANEL_APP_PORT_HTTP2}:443" volumes: - - "${DATA_PATH}:/data" - - "${SSL_PATH}:/etc/letsencrypt" + - ./data/data:/data + - ./data/ssl:/etc/letsencrypt image: jc21/nginx-proxy-manager:github-pr-3027 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/nps/0.26.16/docker-compose.yml b/nps/0.26.16/docker-compose.yml index 715479ae0..2fb29ab89 100644 --- a/nps/0.26.16/docker-compose.yml +++ b/nps/0.26.16/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: nps: image: yisier1/nps:v0.26.16 @@ -28,7 +28,6 @@ services: - 1panel-network labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/php5/5.4.45/build/docker-compose.yml b/php5/5.4.45/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php5/5.4.45/build/docker-compose.yml +++ b/php5/5.4.45/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php5/5.4.45/docker-compose.yml b/php5/5.4.45/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php5/5.4.45/docker-compose.yml +++ b/php5/5.4.45/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php5/5.5.38/build/docker-compose.yml b/php5/5.5.38/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php5/5.5.38/build/docker-compose.yml +++ b/php5/5.5.38/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php5/5.5.38/docker-compose.yml b/php5/5.5.38/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php5/5.5.38/docker-compose.yml +++ b/php5/5.5.38/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php5/5.6.40/build/docker-compose.yml b/php5/5.6.40/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php5/5.6.40/build/docker-compose.yml +++ b/php5/5.6.40/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php5/5.6.40/docker-compose.yml b/php5/5.6.40/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php5/5.6.40/docker-compose.yml +++ b/php5/5.6.40/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php7/7.0.33/build/docker-compose.yml b/php7/7.0.33/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php7/7.0.33/build/docker-compose.yml +++ b/php7/7.0.33/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php7/7.0.33/docker-compose.yml b/php7/7.0.33/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php7/7.0.33/docker-compose.yml +++ b/php7/7.0.33/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php7/7.1.33/build/docker-compose.yml b/php7/7.1.33/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php7/7.1.33/build/docker-compose.yml +++ b/php7/7.1.33/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php7/7.1.33/docker-compose.yml b/php7/7.1.33/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php7/7.1.33/docker-compose.yml +++ b/php7/7.1.33/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php7/7.2.34/build/docker-compose.yml b/php7/7.2.34/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php7/7.2.34/build/docker-compose.yml +++ b/php7/7.2.34/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php7/7.2.34/docker-compose.yml b/php7/7.2.34/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php7/7.2.34/docker-compose.yml +++ b/php7/7.2.34/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php7/7.3.33/build/docker-compose.yml b/php7/7.3.33/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php7/7.3.33/build/docker-compose.yml +++ b/php7/7.3.33/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php7/7.3.33/docker-compose.yml b/php7/7.3.33/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php7/7.3.33/docker-compose.yml +++ b/php7/7.3.33/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php7/7.4.33/build/docker-compose.yml b/php7/7.4.33/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php7/7.4.33/build/docker-compose.yml +++ b/php7/7.4.33/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php7/7.4.33/docker-compose.yml b/php7/7.4.33/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php7/7.4.33/docker-compose.yml +++ b/php7/7.4.33/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php8/8.0.28/build/docker-compose.yml b/php8/8.0.28/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php8/8.0.28/build/docker-compose.yml +++ b/php8/8.0.28/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php8/8.0.28/docker-compose.yml b/php8/8.0.28/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php8/8.0.28/docker-compose.yml +++ b/php8/8.0.28/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php8/8.1.18/build/docker-compose.yml b/php8/8.1.18/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php8/8.1.18/build/docker-compose.yml +++ b/php8/8.1.18/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php8/8.1.18/docker-compose.yml b/php8/8.1.18/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php8/8.1.18/docker-compose.yml +++ b/php8/8.1.18/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/php8/8.2.5/build/docker-compose.yml b/php8/8.2.5/build/docker-compose.yml index 3ae0a6368..76332ace8 100644 --- a/php8/8.2.5/build/docker-compose.yml +++ b/php8/8.2.5/build/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: 1panel-php: build: diff --git a/php8/8.2.5/docker-compose.yml b/php8/8.2.5/docker-compose.yml index 989dc3ae2..9971f7f2d 100644 --- a/php8/8.2.5/docker-compose.yml +++ b/php8/8.2.5/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: php: image: ${IMAGE_NAME} diff --git a/postgresql/15.3-alpine/docker-compose.yml b/postgresql/15.3-alpine/docker-compose.yml index 1270af992..7d8bb7d97 100644 --- a/postgresql/15.3-alpine/docker-compose.yml +++ b/postgresql/15.3-alpine/docker-compose.yml @@ -15,7 +15,6 @@ services: - 1panel-network labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/qiandao/20230618/data.yml b/qiandao/20230618/data.yml index e70dfe1ca..fa66fbb52 100644 --- a/qiandao/20230618/data.yml +++ b/qiandao/20230618/data.yml @@ -8,13 +8,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - default: AESPWD envKey: AES_PWD labelEn: AES encryption key diff --git a/qiandao/20230618/docker-compose.yml b/qiandao/20230618/docker-compose.yml index 956d5f5f9..747fd865f 100644 --- a/qiandao/20230618/docker-compose.yml +++ b/qiandao/20230618/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: qiandao: container_name: ${CONTAINER_NAME} @@ -8,7 +8,7 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:80" volumes: - - "${DATA_PATH}:/usr/src/app/config" + - ./data:/usr/src/app/config environment: # 监听地址 # - BIND=0.0.0.0 @@ -147,7 +147,6 @@ services: # image: a76yyyy/qiandao:lite-latest labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/qinglong/2.15.17/data.yml b/qinglong/2.15.17/data.yml index 964fc0bd5..fd57f6bad 100644 --- a/qinglong/2.15.17/data.yml +++ b/qinglong/2.15.17/data.yml @@ -7,18 +7,4 @@ additionalProperties: labelZh: 网页端口 required: true rule: paramPort - type: number - - default: ./data/data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - - default: ./data/mnt - edit: true - envKey: MOUNT_PATH - labelEn: Mount folder path - labelZh: 挂载文件夹路径 - required: true - type: text \ No newline at end of file + type: number \ No newline at end of file diff --git a/qinglong/2.15.17/docker-compose.yml b/qinglong/2.15.17/docker-compose.yml index 084c354f2..f35d9b660 100644 --- a/qinglong/2.15.17/docker-compose.yml +++ b/qinglong/2.15.17/docker-compose.yml @@ -1,18 +1,17 @@ -version: '2' +version: '3' services: qinglong: - # alpine 基础镜像版本 image: whyour/qinglong:2.15.17 - container_name: ${CONTAINER_NAME} #固定写法,勿改 - networks: + container_name: ${CONTAINER_NAME} + networks: - 1panel-network - # debian-slim 基础镜像版本 - # image: whyour/qinglong:debian volumes: - - "${DATA_PATH}:/opt/qinglong/data" + - ./data:/ql/data ports: - "${PANEL_APP_PORT_HTTP}:5700" restart: always -networks: - 1panel-network: + labels: + createdBy: "Apps" +networks: + 1panel-network: external: true \ No newline at end of file diff --git a/redis-commander/0.8.1/docker-compose.yml b/redis-commander/0.8.1/docker-compose.yml index 29b50945a..b2b07d193 100644 --- a/redis-commander/0.8.1/docker-compose.yml +++ b/redis-commander/0.8.1/docker-compose.yml @@ -1,6 +1,4 @@ -networks: - 1panel-network: - external: true +version: '3' services: redis-commander-XnlR: container_name: ${CONTAINER_NAME} @@ -17,4 +15,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8081 restart: always -version: "3" \ No newline at end of file +networks: + 1panel-network: + external: true \ No newline at end of file diff --git a/redis/6.2.12/docker-compose.yml b/redis/6.2.12/docker-compose.yml index 171a5feaa..106ec7067 100644 --- a/redis/6.2.12/docker-compose.yml +++ b/redis/6.2.12/docker-compose.yml @@ -15,7 +15,6 @@ services: - ./logs:/logs labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/redis/7.0.12/docker-compose.yml b/redis/7.0.12/docker-compose.yml index 2b64183a2..4b153ad7f 100644 --- a/redis/7.0.12/docker-compose.yml +++ b/redis/7.0.12/docker-compose.yml @@ -15,7 +15,6 @@ services: - ./logs:/logs labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/synapse/1.87.0/docker-compose.yml b/synapse/1.87.0/docker-compose.yml index d877b6f54..7b7c104e6 100644 --- a/synapse/1.87.0/docker-compose.yml +++ b/synapse/1.87.0/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: synapse: container_name: ${CONTAINER_NAME} diff --git a/tailchat/1.8.3/docker-compose.yml b/tailchat/1.8.3/docker-compose.yml index 0691c3db8..07a8ef118 100644 --- a/tailchat/1.8.3/docker-compose.yml +++ b/tailchat/1.8.3/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: tailchat: container_name: ${CONTAINER_NAME} @@ -25,7 +25,6 @@ services: - ${PANEL_APP_PORT_HTTP}:11000 labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/typecho/nightly-php7.4-apache/docker-compose.yml b/typecho/nightly-php7.4-apache/docker-compose.yml index f9398295a..7099dc023 100644 --- a/typecho/nightly-php7.4-apache/docker-compose.yml +++ b/typecho/nightly-php7.4-apache/docker-compose.yml @@ -24,7 +24,6 @@ services: - ./data:/app labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/uptime-kuma/1.22.0/docker-compose.yml b/uptime-kuma/1.22.0/docker-compose.yml index 459c195e1..9f77ddbe4 100644 --- a/uptime-kuma/1.22.0/docker-compose.yml +++ b/uptime-kuma/1.22.0/docker-compose.yml @@ -13,7 +13,6 @@ services: - ${PANEL_APP_PORT_HTTP}:3001 labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/watchtower/1.5.3/docker-compose.yml b/watchtower/1.5.3/docker-compose.yml index cfce3f9f5..5f032debd 100644 --- a/watchtower/1.5.3/docker-compose.yml +++ b/watchtower/1.5.3/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: watchtower: container_name: ${CONTAINER_NAME} @@ -14,7 +14,6 @@ services: image: containrrr/watchtower labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/wikijs/2.5.299/docker-compose.yml b/wikijs/2.5.299/docker-compose.yml index 9060fd70f..a845de068 100644 --- a/wikijs/2.5.299/docker-compose.yml +++ b/wikijs/2.5.299/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: wiki: image: requarks/wiki:2.5.299 @@ -17,7 +17,6 @@ services: DB_NAME: ${PANEL_DB_NAME} labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/wordpress/6.2.2/docker-compose.yml b/wordpress/6.2.2/docker-compose.yml index 3e5c3a13a..4be876a93 100644 --- a/wordpress/6.2.2/docker-compose.yml +++ b/wordpress/6.2.2/docker-compose.yml @@ -19,7 +19,6 @@ services: WORDPRESS_DEBUG: 0 labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file diff --git a/zentao/18.5/docker-compose.yml b/zentao/18.5/docker-compose.yml index 7616b6d55..e8f67ca5f 100644 --- a/zentao/18.5/docker-compose.yml +++ b/zentao/18.5/docker-compose.yml @@ -15,7 +15,6 @@ services: - 1panel-network labels: createdBy: "Apps" - networks: 1panel-network: external: true \ No newline at end of file