diff --git a/apps/auto-lady/1.5.3/.env b/apps/auto-lady/1.5.3/.env index a6f1eb1..3258da0 100644 --- a/apps/auto-lady/1.5.3/.env +++ b/apps/auto-lady/1.5.3/.env @@ -13,3 +13,9 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= +# 网络代理地址 +HTTP_PROXY= + +# 跳过代理地址 +NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local + diff --git a/apps/auto-lady/1.5.3/data.yml b/apps/auto-lady/1.5.3/data.yml index 668b067..c0d317d 100644 --- a/apps/auto-lady/1.5.3/data.yml +++ b/apps/auto-lady/1.5.3/data.yml @@ -36,3 +36,17 @@ additionalProperties: labelZh: 自定义挂载目录 3 required: false type: text + - default: "" + edit: true + envKey: HTTP_PROXY + labelZh: 网络代理地址 + labelEn: Network proxy address + required: false + type: text + - default: "localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local" + edit: true + envKey: NO_PROXY + labelZh: 跳过代理地址 + labelEn: Skip proxy address + required: false + type: text diff --git a/apps/auto-lady/1.5.3/docker-compose.yml b/apps/auto-lady/1.5.3/docker-compose.yml index 6d92312..d9c6c70 100644 --- a/apps/auto-lady/1.5.3/docker-compose.yml +++ b/apps/auto-lady/1.5.3/docker-compose.yml @@ -7,6 +7,10 @@ services: env_file: - ./envs/global.env - .env + environment: + - HTTPS_PROXY=${HTTP_PROXY} + - HTTP_PROXY=${HTTP_PROXY:-} + - NO_PROXY=${NO_PROXY:-} image: envyafish/byte-muse:1.5.3 labels: createdBy: Apps diff --git a/apps/byte-muse/1.8.3/.env b/apps/byte-muse/1.8.3/.env index 002ae2c..7198039 100644 --- a/apps/byte-muse/1.8.3/.env +++ b/apps/byte-muse/1.8.3/.env @@ -13,3 +13,9 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= +# 网络代理地址 +HTTP_PROXY= + +# 跳过代理地址 +NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local + diff --git a/apps/byte-muse/1.8.3/data.yml b/apps/byte-muse/1.8.3/data.yml index 54d2be8..afb7784 100644 --- a/apps/byte-muse/1.8.3/data.yml +++ b/apps/byte-muse/1.8.3/data.yml @@ -36,3 +36,17 @@ additionalProperties: labelZh: 自定义挂载目录 3 required: false type: text + - default: "" + edit: true + envKey: HTTP_PROXY + labelZh: 网络代理地址 + labelEn: Network proxy address + required: false + type: text + - default: "localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local" + edit: true + envKey: NO_PROXY + labelZh: 跳过代理地址 + labelEn: Skip proxy address + required: false + type: text diff --git a/apps/byte-muse/1.8.3/docker-compose.yml b/apps/byte-muse/1.8.3/docker-compose.yml index ee51b84..c85a1cd 100644 --- a/apps/byte-muse/1.8.3/docker-compose.yml +++ b/apps/byte-muse/1.8.3/docker-compose.yml @@ -7,6 +7,10 @@ services: env_file: - ./envs/global.env - .env + environment: + - HTTPS_PROXY=${HTTP_PROXY} + - HTTP_PROXY=${HTTP_PROXY:-} + - NO_PROXY=${NO_PROXY:-} image: envyafish/byte-muse:1.8.3 labels: createdBy: Apps diff --git a/apps/page-spy-web/2.2.0/.env b/apps/page-spy-web/2.2.1/.env similarity index 100% rename from apps/page-spy-web/2.2.0/.env rename to apps/page-spy-web/2.2.1/.env diff --git a/apps/page-spy-web/2.2.0/data.yml b/apps/page-spy-web/2.2.1/data.yml similarity index 100% rename from apps/page-spy-web/2.2.0/data.yml rename to apps/page-spy-web/2.2.1/data.yml diff --git a/apps/page-spy-web/2.2.0/docker-compose.yml b/apps/page-spy-web/2.2.1/docker-compose.yml similarity index 90% rename from apps/page-spy-web/2.2.0/docker-compose.yml rename to apps/page-spy-web/2.2.1/docker-compose.yml index 64b4275..07e1003 100644 --- a/apps/page-spy-web/2.2.0/docker-compose.yml +++ b/apps/page-spy-web/2.2.1/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: huolalatech/page-spy-web:v2.2.0 + image: huolalatech/page-spy-web:v2.2.1 labels: createdBy: Apps networks: diff --git a/apps/page-spy-web/2.2.0/envs/default.env b/apps/page-spy-web/2.2.1/envs/default.env similarity index 100% rename from apps/page-spy-web/2.2.0/envs/default.env rename to apps/page-spy-web/2.2.1/envs/default.env diff --git a/apps/page-spy-web/2.2.0/envs/global.env b/apps/page-spy-web/2.2.1/envs/global.env similarity index 100% rename from apps/page-spy-web/2.2.0/envs/global.env rename to apps/page-spy-web/2.2.1/envs/global.env diff --git a/apps/page-spy-web/2.2.0/scripts/init.sh b/apps/page-spy-web/2.2.1/scripts/init.sh similarity index 100% rename from apps/page-spy-web/2.2.0/scripts/init.sh rename to apps/page-spy-web/2.2.1/scripts/init.sh diff --git a/apps/page-spy-web/2.2.0/scripts/uninstall.sh b/apps/page-spy-web/2.2.1/scripts/uninstall.sh similarity index 100% rename from apps/page-spy-web/2.2.0/scripts/uninstall.sh rename to apps/page-spy-web/2.2.1/scripts/uninstall.sh diff --git a/apps/page-spy-web/2.2.0/scripts/upgrade.sh b/apps/page-spy-web/2.2.1/scripts/upgrade.sh similarity index 100% rename from apps/page-spy-web/2.2.0/scripts/upgrade.sh rename to apps/page-spy-web/2.2.1/scripts/upgrade.sh diff --git a/apps/pingvin-share/1.10.3/.env b/apps/pingvin-share/1.10.4/.env similarity index 100% rename from apps/pingvin-share/1.10.3/.env rename to apps/pingvin-share/1.10.4/.env diff --git a/apps/pingvin-share/1.10.3/data.yml b/apps/pingvin-share/1.10.4/data.yml similarity index 100% rename from apps/pingvin-share/1.10.3/data.yml rename to apps/pingvin-share/1.10.4/data.yml diff --git a/apps/pingvin-share/1.10.3/docker-compose.yml b/apps/pingvin-share/1.10.4/docker-compose.yml similarity index 92% rename from apps/pingvin-share/1.10.3/docker-compose.yml rename to apps/pingvin-share/1.10.4/docker-compose.yml index 58f3bec..5270df7 100644 --- a/apps/pingvin-share/1.10.3/docker-compose.yml +++ b/apps/pingvin-share/1.10.4/docker-compose.yml @@ -12,7 +12,7 @@ services: - PORT=3333 - API_URL=http://localhost:8080 - TRUST_PROXY=false - image: stonith404/pingvin-share:v1.10.3 + image: stonith404/pingvin-share:v1.10.4 labels: createdBy: Apps networks: diff --git a/apps/pingvin-share/1.10.3/envs/default.env b/apps/pingvin-share/1.10.4/envs/default.env similarity index 100% rename from apps/pingvin-share/1.10.3/envs/default.env rename to apps/pingvin-share/1.10.4/envs/default.env diff --git a/apps/pingvin-share/1.10.3/envs/global.env b/apps/pingvin-share/1.10.4/envs/global.env similarity index 100% rename from apps/pingvin-share/1.10.3/envs/global.env rename to apps/pingvin-share/1.10.4/envs/global.env diff --git a/apps/pingvin-share/1.10.3/scripts/init.sh b/apps/pingvin-share/1.10.4/scripts/init.sh similarity index 100% rename from apps/pingvin-share/1.10.3/scripts/init.sh rename to apps/pingvin-share/1.10.4/scripts/init.sh diff --git a/apps/pingvin-share/1.10.3/scripts/uninstall.sh b/apps/pingvin-share/1.10.4/scripts/uninstall.sh similarity index 100% rename from apps/pingvin-share/1.10.3/scripts/uninstall.sh rename to apps/pingvin-share/1.10.4/scripts/uninstall.sh diff --git a/apps/pingvin-share/1.10.3/scripts/upgrade.sh b/apps/pingvin-share/1.10.4/scripts/upgrade.sh similarity index 100% rename from apps/pingvin-share/1.10.3/scripts/upgrade.sh rename to apps/pingvin-share/1.10.4/scripts/upgrade.sh diff --git a/apps/stash/0.28.1/.env b/apps/stash/0.28.1/.env index f259f93..9eebd75 100644 --- a/apps/stash/0.28.1/.env +++ b/apps/stash/0.28.1/.env @@ -16,3 +16,9 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= +# 网络代理地址 +HTTP_PROXY= + +# 跳过代理地址 +NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local + diff --git a/apps/stash/0.28.1/data.yml b/apps/stash/0.28.1/data.yml index 998738e..f699dae 100644 --- a/apps/stash/0.28.1/data.yml +++ b/apps/stash/0.28.1/data.yml @@ -52,3 +52,17 @@ additionalProperties: labelZh: 自定义挂载目录 3 required: false type: text + - default: "" + edit: true + envKey: HTTP_PROXY + labelZh: 网络代理地址 + labelEn: Network proxy address + required: false + type: text + - default: "localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local" + edit: true + envKey: NO_PROXY + labelZh: 跳过代理地址 + labelEn: Skip proxy address + required: false + type: text diff --git a/apps/stash/0.28.1/docker-compose.yml b/apps/stash/0.28.1/docker-compose.yml index 9798d9b..1328fa2 100644 --- a/apps/stash/0.28.1/docker-compose.yml +++ b/apps/stash/0.28.1/docker-compose.yml @@ -14,6 +14,9 @@ services: - STASH_GENERATED=/generated/ - STASH_METADATA=/metadata/ - STASH_CACHE=/cache/ + - HTTPS_PROXY=${HTTP_PROXY} + - HTTP_PROXY=${HTTP_PROXY:-} + - NO_PROXY=${NO_PROXY:-} image: stashapp/stash:v0.28.1 labels: createdBy: Apps