github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-05 04:11:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: [CDE-553]: concat skopeo stdout and stderr output (#3149)

Browse Source 
* feat: [CDE-553]: concat output
This commit is contained in:
Vikyath Harekal 2024-12-11 12:32:34 +00:00 committed by Harness
parent 2f83725e12
commit e18f16e688
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/gitspace/orchestrator/container/devcontainer_container_utils.go
View File

@ -410,18 +410,17 @@ func CopyImage(
gitspaceLogger.Info("Executing image copy command: " + cmd.String()) gitspaceLogger.Info("Executing image copy command: " + cmd.String())
cmdErr := cmd.Run() cmdErr := cmd.Run()
// Log command output
response, err := io.ReadAll(&outBuf) response, err := io.ReadAll(&outBuf)
if err != nil { if err != nil {
return logStreamWrapError(gitspaceLogger, "Error while reading image output", err) return logStreamWrapError(gitspaceLogger, "Error while reading image output", err)
} }
gitspaceLogger.Info("Image copy output: " + string(response)) gitspaceLogger.Info("Image copy output: " + string(response))
errResponse, err := io.ReadAll(&errBuf) errResponse, err := io.ReadAll(&errBuf)
if err != nil { if err != nil {
return logStreamWrapError(gitspaceLogger, "Error while reading image output", err) return logStreamWrapError(gitspaceLogger, "Error while reading image output", err)
} }
gitspaceLogger.Error("Image copy error output: "+string(errResponse), nil) combinedOutput := string(response) + "\n" + string(errResponse)
gitspaceLogger.Info("Image copy combined output: " + combinedOutput)
if cmdErr != nil { if cmdErr != nil {
return logStreamWrapError(gitspaceLogger, "Error while pulling image using skopeo", cmdErr) return logStreamWrapError(gitspaceLogger, "Error while pulling image using skopeo", cmdErr)