diff --git a/App.go b/App.go index 7dc7a5cf..d50b1583 100644 --- a/App.go +++ b/App.go @@ -45,7 +45,7 @@ func main() { } if ciCdRequest.Type == util.CIEVENT { - ciRequest := ciCdRequest.CiRequest + //ciRequest := ciCdRequest.CiRequest artifactUploaded, err := runCIStages(ciCdRequest) log.Println(util.DEVTRON, artifactUploaded, err) var artifactUploadErr error @@ -58,14 +58,14 @@ func main() { os.Exit(1) } - // sync cache + /*// sync cache log.Println(util.DEVTRON, " cache-push") err = helper.SyncCache(ciRequest) if err != nil { log.Println(err) os.Exit(1) } - log.Println(util.DEVTRON, " /cache-push") + log.Println(util.DEVTRON, " /cache-push")*/ } else { err = runCDStages(ciCdRequest) artifactUploadErr := collectAndUploadCDArtifacts(ciCdRequest.CdRequest) @@ -171,13 +171,13 @@ func runCIStages(ciCdRequest *helper.CiCdTriggerEvent) (artifactUploaded bool, e _ = os.Mkdir(util.WORKINGDIR, os.ModeDir) } - // Get ci cache + /*// Get ci cache log.Println(util.DEVTRON, " cache-pull") err = helper.GetCache(ciCdRequest.CiRequest) if err != nil { return artifactUploaded, err } - log.Println(util.DEVTRON, " /cache-pull") + log.Println(util.DEVTRON, " /cache-pull")*/ err = os.Chdir(util.WORKINGDIR) if err != nil { diff --git a/helper/DockerHelper.go b/helper/DockerHelper.go index 5d3c0222..a38b54da 100644 --- a/helper/DockerHelper.go +++ b/helper/DockerHelper.go @@ -235,6 +235,20 @@ func BuildArtifact(ciRequest *CiRequest) (string, error) { log.Println(err) return "", err } + + /*log.Println(" -----> copying content") + + // copy content + dockerCopyCommand := "docker run --rm --entrypoint \"/bin/sh\" -v /devtroncd/.m2:/root/.m3 " + dest + " -c \"rsync -tr /root/.m2/repository /root/.m3\"" + dockerCopyExec := exec.Command("/bin/sh", "-c", dockerCopyCommand) + err = util.RunCommand(dockerCopyExec) + if err != nil { + log.Println(err) + return "", err + } + + log.Println(" -----> copied content")*/ + } return dest, nil } diff --git a/scriptExecutor.go b/scriptExecutor.go index dc1b1b70..6956f28f 100644 --- a/scriptExecutor.go +++ b/scriptExecutor.go @@ -242,7 +242,7 @@ set -e } func buildDockerRunCommand(executionConf *executionConf) (string, error) { - cmdTemplate := `docker run \ + cmdTemplate := `docker run --network host \ --env-file {{.EnvInputFileName}} \ -v {{.EntryScriptFileName}}:/devtron_script/_entry.sh \ -v {{.EnvOutFileName}}:/devtron_script/_out.env \