diff --git a/agent-common/image/ImageNameConvert_test.go b/agent-common/image/ImageNameConvert_test.go index 315e7d3..43e1b8d 100755 --- a/agent-common/image/ImageNameConvert_test.go +++ b/agent-common/image/ImageNameConvert_test.go @@ -200,13 +200,27 @@ func TestGzipFileNameToImageFullName(t *testing.T) { } } +func TestImageGzipFileNameToImageFullName_1(t *testing.T) { + gzipFilePrefix := "/root/octopus_image/middle/" + filepath.WalkDir(gzipFilePrefix, func(path string, d os.DirEntry, err error) error { + //fmt.Println(path) + name := d.Name() + if strings.HasSuffix(name, ".tar.gz") { + fullName := GzipFileNameToImageFullName(name) + fmt.Println(fullName) + } + + return nil + }) +} + func TestImageGzipFileNameToImageFullName(t *testing.T) { frontendMap := make(map[string]string) backendMap := make(map[string]string) srsMap := make(map[string]string) - gzipFilePrefix := "/root/octopus_image/xjyd/" + gzipFilePrefix := "/root/octopus_image/middle/" filepath.WalkDir(gzipFilePrefix, func(path string, d os.DirEntry, err error) error { //fmt.Println(path) name := d.Name() diff --git a/agent-go/a_executor/BaseFunction.go b/agent-go/a_executor/BaseFunction.go index b72d669..8cbf175 100755 --- a/agent-go/a_executor/BaseFunction.go +++ b/agent-go/a_executor/BaseFunction.go @@ -866,7 +866,7 @@ func (op *AgentOsOperator) installDockerExec(args []string) (bool, []string) { // get by method ok, log4 := HardCodeCommandExecutor("apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}'") - if ok { + if ok && log4 != nil && len(log4) > 0 { specificDockerVersion = strings.TrimSpace(log4[0]) } diff --git a/agent-go/a_executor/FunctionalExecutor_test.go b/agent-go/a_executor/FunctionalExecutor_test.go index 2216884..b93d01e 100755 --- a/agent-go/a_executor/FunctionalExecutor_test.go +++ b/agent-go/a_executor/FunctionalExecutor_test.go @@ -183,7 +183,7 @@ func TestHardCodeCommandExecutor(t *testing.T) { // get by method ok, log4 := HardCodeCommandExecutor("apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}'") - if ok { + if ok && log4 != nil && len(log4) > 0 { specificDockerVersion = strings.TrimSpace(log4[0]) }