From 62eee2de8224d7b8f1f931c19fbfb3814f2f93e8 Mon Sep 17 00:00:00 2001 From: Darren <27513732@qq.com> Date: Mon, 9 Oct 2023 10:49:18 +0800 Subject: [PATCH] fix --- install/install.sh | 4 ++-- systemd/script/send_credentials.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/install/install.sh b/install/install.sh index 2f31a88d..e5de0508 100644 --- a/install/install.sh +++ b/install/install.sh @@ -91,8 +91,8 @@ export systemd_path="/opt/websoft9/systemd" export source_zip="websoft9-$version.zip" export source_unzip="websoft9" export source_github_pages="https://websoft9.github.io/websoft9" -export tools_yum="git curl wget yum-utils jq bc unzip" -export tools_apt="git curl wget jq bc unzip" +export tools_yum="git curl wget yum-utils jq bc unzip inotify-tools" +export tools_apt="git curl wget jq bc unzip inotify-tools" export docker_network="websoft9" export artifact_url="https://w9artifact.blob.core.windows.net/$channel/websoft9" echo Install from url: $artifact_url diff --git a/systemd/script/send_credentials.sh b/systemd/script/send_credentials.sh index 0d662cc9..c85182b0 100644 --- a/systemd/script/send_credentials.sh +++ b/systemd/script/send_credentials.sh @@ -5,6 +5,8 @@ set -e trap "sleep 1; continue" ERR try_times=100 counter=1 + + portainer_username="admin" credential_path="/var/websoft9/credential" apphub_container_name="websoft9-apphub" @@ -12,7 +14,7 @@ apphub_container_name="websoft9-apphub" copy_credential() { # 设置参数的默认值 - source_container="websoft9-git" + source_container= source_path="/var/websoft9/credential" destination_container="websoft9-apphub" destination_path="/websoft9/credentials/credential_git"