From 528635f30decb3ddc97d5b2462a73ed56d3f0def Mon Sep 17 00:00:00 2001 From: okxlin <61420215+okxlin@users.noreply.github.com> Date: Sun, 18 Oct 2026 21:30:52 +0800 Subject: [PATCH] fix(imgproxy): add 4.0.18 upgrade package Keep 4.0.17 available for existing installs and add 4.0.18 with the updated image. The isolated 1Panel v2 4.0.17 to 4.0.18 upgrade, restart, and uninstall smoke passed. --- apps/imgproxy/4.0.17/docker-compose.yml | 2 +- apps/imgproxy/4.0.18/.env.sample | 6 ++ apps/imgproxy/4.0.18/data.yml | 88 +++++++++++++++++++++++ apps/imgproxy/4.0.18/docker-compose.yml | 36 ++++++++++ apps/imgproxy/4.0.18/scripts/init.sh | 4 ++ apps/imgproxy/4.0.18/scripts/uninstall.sh | 8 +++ apps/imgproxy/4.0.18/scripts/upgrade.sh | 4 ++ 7 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 apps/imgproxy/4.0.18/.env.sample create mode 100644 apps/imgproxy/4.0.18/data.yml create mode 100644 apps/imgproxy/4.0.18/docker-compose.yml create mode 100755 apps/imgproxy/4.0.18/scripts/init.sh create mode 100755 apps/imgproxy/4.0.18/scripts/uninstall.sh create mode 100755 apps/imgproxy/4.0.18/scripts/upgrade.sh diff --git a/apps/imgproxy/4.0.17/docker-compose.yml b/apps/imgproxy/4.0.17/docker-compose.yml index 6ccfaf299..884f4a5f1 100644 --- a/apps/imgproxy/4.0.17/docker-compose.yml +++ b/apps/imgproxy/4.0.17/docker-compose.yml @@ -1,6 +1,6 @@ services: imgproxy: - image: "ghcr.io/imgproxy/imgproxy:v4.0.18" + image: "ghcr.io/imgproxy/imgproxy:v4.0.17" container_name: ${CONTAINER_NAME} restart: unless-stopped ports: diff --git a/apps/imgproxy/4.0.18/.env.sample b/apps/imgproxy/4.0.18/.env.sample new file mode 100644 index 000000000..e5ac72e13 --- /dev/null +++ b/apps/imgproxy/4.0.18/.env.sample @@ -0,0 +1,6 @@ +CONTAINER_NAME=imgproxy-compose-check +PANEL_APP_PORT_HTTP=8080 +IMGPROXY_KEY= +IMGPROXY_SALT= +IMGPROXY_ALLOWED_SOURCES= +IMGPROXY_ALLOW_PRIVATE_SOURCE_ADDRESSES=false diff --git a/apps/imgproxy/4.0.18/data.yml b/apps/imgproxy/4.0.18/data.yml new file mode 100644 index 000000000..5b14b111e --- /dev/null +++ b/apps/imgproxy/4.0.18/data.yml @@ -0,0 +1,88 @@ +additionalProperties: + formFields: + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: HTTP Port + labelZh: HTTP 端口 + label: + en: HTTP Port + zh: HTTP 端口 + zh-Hant: HTTP 連接埠 + ja: HTTP ポート + ko: HTTP 포트 + ru: HTTP-порт + ms: Port HTTP + pt-br: Porta HTTP + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: IMGPROXY_KEY + labelEn: Signature Key + labelZh: 签名 Key + label: + en: Signature Key + zh: 签名 Key + zh-Hant: 簽章金鑰 + ja: 署名キー + ko: 서명 키 + ru: Ключ подписи + ms: Kunci Tandatangan + pt-br: Chave de assinatura + required: false + type: password + - default: "" + edit: true + envKey: IMGPROXY_SALT + labelEn: Signature Salt + labelZh: 签名 Salt + label: + en: Signature Salt + zh: 签名 Salt + zh-Hant: 簽章鹽值 + ja: 署名ソルト + ko: 서명 솔트 + ru: Соль подписи + ms: Garam Tandatangan + pt-br: Salt de assinatura + required: false + type: password + - default: "" + edit: true + envKey: IMGPROXY_ALLOWED_SOURCES + labelEn: Allowed Sources + labelZh: 来源白名单 + label: + en: Allowed Sources + zh: 来源白名单 + zh-Hant: 來源允許清單 + ja: 許可する取得元 + ko: 허용된 원본 + ru: Разрешенные источники + ms: Sumber Dibenarkan + pt-br: Origens permitidas + required: false + type: text + - default: "false" + edit: true + envKey: IMGPROXY_ALLOW_PRIVATE_SOURCE_ADDRESSES + labelEn: Allow Private Sources + labelZh: 允许私有网络来源 + label: + en: Allow Private Sources + zh: 允许私有网络来源 + zh-Hant: 允許私有網路來源 + ja: プライベートネットワークを許可 + ko: 사설 네트워크 원본 허용 + ru: Разрешить частные сети + ms: Benarkan Sumber Rangkaian Peribadi + pt-br: Permitir origens de rede privada + required: true + type: select + values: + - label: "false" + value: "false" + - label: "true" + value: "true" diff --git a/apps/imgproxy/4.0.18/docker-compose.yml b/apps/imgproxy/4.0.18/docker-compose.yml new file mode 100644 index 000000000..6ccfaf299 --- /dev/null +++ b/apps/imgproxy/4.0.18/docker-compose.yml @@ -0,0 +1,36 @@ +services: + imgproxy: + image: "ghcr.io/imgproxy/imgproxy:v4.0.18" + container_name: ${CONTAINER_NAME} + restart: unless-stopped + ports: + - "${PANEL_APP_PORT_HTTP}:8080" + environment: + - IMGPROXY_KEY=${IMGPROXY_KEY} + - IMGPROXY_SALT=${IMGPROXY_SALT} + - IMGPROXY_ALLOWED_SOURCES=${IMGPROXY_ALLOWED_SOURCES} + - IMGPROXY_ALLOW_PRIVATE_SOURCE_ADDRESSES=${IMGPROXY_ALLOW_PRIVATE_SOURCE_ADDRESSES} + - IMGPROXY_ALLOW_LOOPBACK_SOURCE_ADDRESSES=false + - IMGPROXY_ALLOW_LINK_LOCAL_SOURCE_ADDRESSES=false + - IMGPROXY_IGNORE_SSL_VERIFICATION=false + healthcheck: + test: + - CMD + - imgproxy + - health + interval: 30s + timeout: 5s + retries: 3 + start_period: 10s + cap_drop: + - ALL + security_opt: + - no-new-privileges:true + networks: + - 1panel-network + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/imgproxy/4.0.18/scripts/init.sh b/apps/imgproxy/4.0.18/scripts/init.sh new file mode 100755 index 000000000..2a53d75f3 --- /dev/null +++ b/apps/imgproxy/4.0.18/scripts/init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail + +exit 0 diff --git a/apps/imgproxy/4.0.18/scripts/uninstall.sh b/apps/imgproxy/4.0.18/scripts/uninstall.sh new file mode 100755 index 000000000..5a3f6bd6b --- /dev/null +++ b/apps/imgproxy/4.0.18/scripts/uninstall.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -euo pipefail + +if command -v docker-compose >/dev/null 2>&1; then + docker-compose down --volumes --remove-orphans +else + docker compose down --volumes --remove-orphans +fi diff --git a/apps/imgproxy/4.0.18/scripts/upgrade.sh b/apps/imgproxy/4.0.18/scripts/upgrade.sh new file mode 100755 index 000000000..2a53d75f3 --- /dev/null +++ b/apps/imgproxy/4.0.18/scripts/upgrade.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail + +exit 0