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

[ Agent ] [ App ] - offline build chrony server

Browse Source
This commit is contained in:
zeaslity
2023-12-15 14:13:41 +08:00
parent 18a42007c1
commit 5304326a05
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1808,10 +1808,10 @@ func (op *AgentOsOperator) installChronyByDockerExec(funcArgs []string) (bool, [
} }
} }
// check image exists parseIP := net.ParseIP(funcArgs[0])
if !BasicDockerImageExists("simonrupf/chronyd", "0.4.3") { if parseIP == nil {
return false, []string{ return false, []string{
"[installChronyByDockerExec] - docker image not exists !", "[installChronyByDockerExec] - ip args error !",
} }
} }
@@ -1825,7 +1825,7 @@ func (op *AgentOsOperator) installChronyByDockerExec(funcArgs []string) (bool, [
"--publish=123:123/udp", "--publish=123:123/udp",
"--env=NTP_SERVERS=\"ntp1.aliyun.com,ntp2.aliyun.com,ntp3.aliyun.com,ntp4.aliyun.com\"", "--env=NTP_SERVERS=\"ntp1.aliyun.com,ntp2.aliyun.com,ntp3.aliyun.com,ntp4.aliyun.com\"",
"--env=LOG_LEVEL=0", "--env=LOG_LEVEL=0",
"simonrupf/chronyd", funcArgs[0] + "：8033/cmii/chronyd:0.4.3",
}) })
if !ok { if !ok {
return false, append(resultLog, "[installChronyByDockerExec] - docker chrony run error !") return false, append(resultLog, "[installChronyByDockerExec] - docker chrony run error !")

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

@@ -95,10 +95,10 @@ public class BaseFuncScheduler {
List<BaseFunctionEnum> masterNodeProcedureList = List.of( List<BaseFunctionEnum> masterNodeProcedureList = List.of(
// BaseFunctionEnum.DISABLE_SWAP, BaseFunctionEnum.DISABLE_SWAP,
// BaseFunctionEnum.SHUTDOWN_FIREWALL, BaseFunctionEnum.SHUTDOWN_FIREWALL,
// BaseFunctionEnum.CHRONY_TO_MASTER, BaseFunctionEnum.CHRONY_TO_MASTER,
// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY
); );
@@ -132,7 +132,7 @@ public class BaseFuncScheduler {
} }
List<BaseFunctionEnum> masterNodeDurationTaskList = List.of( List<BaseFunctionEnum> masterNodeDurationTaskList = List.of(
// BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE, BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE,
BaseFunctionEnum.INSTALL_DOCKER, BaseFunctionEnum.INSTALL_DOCKER,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
BaseFunctionEnum.MODIFY_DOCKER_CONFIG, BaseFunctionEnum.MODIFY_DOCKER_CONFIG,

4
server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
View File

@@ -53,11 +53,11 @@ public class TestBaseFuncScheduler {
projectDeployContext.setMasterNode(serverInfoPO); projectDeployContext.setMasterNode(serverInfoPO);
baseFuncScheduler.runProcedure(projectDeployContext); // baseFuncScheduler.runProcedure(projectDeployContext);
// harborFuncScheduler.runProcedure(projectDeployContext); // harborFuncScheduler.runProcedure(projectDeployContext);
// appFuncScheduler.runProcedure(projectDeployContext); appFuncScheduler.runProcedure(projectDeployContext);
} }
} }