diff --git a/agent-go/executor/BaseFunction.go b/agent-go/executor/BaseFunction.go index ca3c8b4..ea82c8d 100644 --- a/agent-go/executor/BaseFunction.go +++ b/agent-go/executor/BaseFunction.go @@ -967,7 +967,7 @@ func (op *AgentOsOperator) installHarbor() [][]string { func (op *AgentOsOperator) installHarborExec() (bool, []string) { // check docker-compose - if !BasicCommandExists("docker-compose") { + if !BasicFileExistAndNotNull("/usr/local/bin/docker-compose") { return false, []string{ "docker-compose uninstalled ! can't install harbor!", } diff --git a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java index 20e0113..bef7375 100644 --- a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java @@ -86,15 +86,16 @@ public class BaseFuncScheduler { private boolean MasterNodeProcedure(String masterTopicName) { List masterNodeProcedureList = List.of( - BaseFunctionEnum.DISABLE_SWAP, - BaseFunctionEnum.SHUTDOWN_FIREWALL, - BaseFunctionEnum.INSTALL_CHRONY, - BaseFunctionEnum.CHRONY_TO_PUBLIC_NTP, - BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, - BaseFunctionEnum.INSTALL_DOCKER, - BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, - BaseFunctionEnum.INSTALL_HARBOR, - BaseFunctionEnum.INSTALL_ZSH +// BaseFunctionEnum.DISABLE_SWAP, +// BaseFunctionEnum.SHUTDOWN_FIREWALL, +// BaseFunctionEnum.INSTALL_CHRONY, +// BaseFunctionEnum.CHRONY_TO_PUBLIC_NTP, +// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, +// BaseFunctionEnum.INSTALL_DOCKER, +// BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, +// BaseFunctionEnum.INSTALL_HARBOR, +// BaseFunctionEnum.INSTALL_ZSH + BaseFunctionEnum.INSTALL_HARBOR );