Skip to content

Commit ff95cdf

Browse files
committed
docker: Bump oasis-cli to 0.15.3
1 parent 892d3ea commit ff95cdf

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.changelog/82.feature.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
docker: Bump oasis-cli to 0.15.3

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM golang:1.25-bookworm AS builder
33
WORKDIR /app
44

5-
ARG OASIS_CLI_VERSION=0.15.2
5+
ARG OASIS_CLI_VERSION=0.15.3
66
# ARG OASIS_CLI_BRANCH=master
77

88
# Download or build oasis CLI.

worker/oasiscli/oasiscli.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"context"
77
"encoding/json"
88
"fmt"
9+
"io"
910
"log/slog"
1011
"math/rand"
1112
"os"
@@ -122,7 +123,8 @@ func (r *Runner) Run(ctx context.Context, input RunInput) (*CommandResult, error
122123
c.SysProcAttr = getSysProcAttr()
123124

124125
var outputBuf bytes.Buffer
125-
c.Stdout = &outputBuf
126+
var stdoutBuf bytes.Buffer
127+
c.Stdout = io.MultiWriter(&outputBuf, &stdoutBuf)
126128
c.Stderr = &outputBuf
127129

128130
results := &CommandResult{}
@@ -164,8 +166,8 @@ func (r *Runner) Run(ctx context.Context, input RunInput) (*CommandResult, error
164166
case CommandPush:
165167
// The output should be a JSON object with the OCI digest and manifest hash.
166168
var parsed map[string]string
167-
if err := json.Unmarshal(results.Logs, &parsed); err != nil {
168-
slog.Error("failed to parse push output", "error", err, "logs", results.Logs)
169+
if err := json.Unmarshal(stdoutBuf.Bytes(), &parsed); err != nil {
170+
slog.Error("failed to parse push output", "error", err, "stdout", stdoutBuf.Bytes(), "logs", results.Logs)
169171
return nil, fmt.Errorf("failed to parse push output: %w", err)
170172
}
171173
if parsed["oci_reference"] == "" {

0 commit comments

Comments
 (0)