zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ Agent ] [ Executor ] - 新增InstallHarbor部分

Browse Source
This commit is contained in:
zeaslity
2023-11-08 15:00:31 +08:00
parent ce108b2f4d
commit e6ee805fa5
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-go/executor/BaseFunction.go
View File

@@ -967,7 +967,7 @@ func (op *AgentOsOperator) installHarbor() [][]string {
func (op *AgentOsOperator) installHarborExec() (bool, []string) { func (op *AgentOsOperator) installHarborExec() (bool, []string) {
// check docker-compose // check docker-compose
if !BasicCommandExists("docker-compose") { if !BasicFileExistAndNotNull("/usr/local/bin/docker-compose") {
return false, []string{ return false, []string{
"docker-compose uninstalled ! can't install harbor!", "docker-compose uninstalled ! can't install harbor!",
} }

19
server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java
View File

@@ -86,15 +86,16 @@ public class BaseFuncScheduler {
private boolean MasterNodeProcedure(String masterTopicName) { private boolean MasterNodeProcedure(String masterTopicName) {
List<BaseFunctionEnum> masterNodeProcedureList = List.of( List<BaseFunctionEnum> masterNodeProcedureList = List.of(
BaseFunctionEnum.DISABLE_SWAP, // BaseFunctionEnum.DISABLE_SWAP,
BaseFunctionEnum.SHUTDOWN_FIREWALL, // BaseFunctionEnum.SHUTDOWN_FIREWALL,
BaseFunctionEnum.INSTALL_CHRONY, // BaseFunctionEnum.INSTALL_CHRONY,
BaseFunctionEnum.CHRONY_TO_PUBLIC_NTP, // BaseFunctionEnum.CHRONY_TO_PUBLIC_NTP,
BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, // BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
BaseFunctionEnum.INSTALL_DOCKER, // BaseFunctionEnum.INSTALL_DOCKER,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, // BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
BaseFunctionEnum.INSTALL_HARBOR, // BaseFunctionEnum.INSTALL_HARBOR,
BaseFunctionEnum.INSTALL_ZSH // BaseFunctionEnum.INSTALL_ZSH
BaseFunctionEnum.INSTALL_HARBOR
); );