PCA/amnezia_web
1
0
Fork 0
mirror of https://github.com/andrey271192/amnezia_web.git synced 2026-09-20 14:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(community): install curl in docker helper before private install.sh

Browse Source 
Alpine docker:26-cli lacked curl causing PRO install to fail/tar garbage;
also sweep containers matching name substring amnezia-admin-pro (compose IDs).

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Андрей Бобырев
2026-05-15 01:20:05 +03:00
parent 6c213ef49e
commit 08fb053d9f
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server.js
View File

@@ -378,6 +378,26 @@ function shellSafeDockerContainerName(raw, fallback) {
return fallback;
}
/**
* Одноразовый helper (`docker:*-cli`) часто Alpine без curl, а частный PRO install.sh дергает `curl`/GitHub —
* см. сообщество: `curl: command not found`, затем tar «invalid magic».
* Установить curl/ca-cert перед `bash ./install.sh`. Отключить: COMMUNITY_HELPER_SKIP_PREPARE_TOOLS=1.
*/
function dockerCliHelperEnsureFetchToolsScript() {
if (envTruthy(process.env.COMMUNITY_HELPER_SKIP_PREPARE_TOOLS)) return "";
return `
# Инструменты для приватного install.sh (образ Docker CLI может быть без curl)
if ! command -v curl >/dev/null 2>&1; then
if command -v apk >/dev/null 2>&1; then
apk add --no-cache curl ca-certificates || echo "⚠ helper: apk add curl failed — приватный install.sh может упасть" >> /mnt/data/community-install-last.log
elif command -v apt-get >/dev/null 2>&1; then
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq >/dev/null && apt-get install -y -qq curl ca-certificates || echo "⚠ helper: apt install curl failed — приватный install.sh может упасть" >> /mnt/data/community-install-last.log
fi
fi
`.trim();
}
function privateInstallScriptUrlLogged() {
try {
const u = new URL(COMMUNITY_PRIVATE_INSTALL_SCRIPT_URL);
@@ -1546,11 +1566,16 @@ app.post("/api/community/run-private-install", requireAuth, async (req, res) =>
const dataAbs = path.resolve(DATA_DIR);
const prelude = COMMUNITY_SKIP_REMOVE_FREE_BEFORE_PRIVATE_PRO
? "sleep 2"
: `sleep 3; docker rm -f ${freePanelName} ${freeLandingName} 2>/dev/null || true; docker rm -f ${staleProName} 2>/dev/null || true`;
: [
`sleep 3; docker rm -f ${freePanelName} ${freeLandingName} 2>/dev/null || true`,
`docker rm -f ${staleProName} 2>/dev/null || true`,
'for __amz_hp in $(docker ps -aq --filter name=amnezia-admin-pro 2>/dev/null || true); do docker rm -f "$__amz_hp" 2>/dev/null || true; done',
].join(" ");
const fetchTools = dockerCliHelperEnsureFetchToolsScript();
const sh = `
set -eu
${prelude}
cd /mnt/stage && exec bash ./install.sh >> /mnt/data/community-install-last.log 2>&1
${fetchTools ? `${fetchTools}\n` : ""}cd /mnt/stage && exec bash ./install.sh >> /mnt/data/community-install-last.log 2>&1
`.trim();
const dr = spawn(