Skip to content

Commit 3cfbff3

Browse files
authored
Merge pull request #134 from oasisprotocol/ptrus/feature/cli-0.18.1
docker: Bump oasis-cli to 0.18.1
2 parents 711792e + 664d9b9 commit 3cfbff3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Build stage
2-
FROM golang:1.25-bookworm AS builder
2+
# Using trixie for GLIBC 2.38+ compatibility with oasis CLI pre-built binaries.
3+
FROM golang:1.25-trixie AS builder
34
WORKDIR /app
45

5-
ARG OASIS_CLI_VERSION=0.17.1
6-
# ARG OASIS_CLI_BRANCH=master
6+
ARG OASIS_CLI_VERSION=0.18.1
77

88
# Download or build oasis CLI.
99
RUN if [ "x${OASIS_CLI_BRANCH}" != "x" ]; then \
@@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
3030
go build -o rofl-app ./
3131

3232
# Runner.
33-
FROM golang:1.25-bookworm AS app
33+
FROM golang:1.25-trixie AS app
3434

3535
# Install minimal runtime dependencies
3636
RUN apt-get update -qq && \

worker/oasiscli/oasiscli.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (r *Runner) Run(ctx context.Context, input RunInput) (*CommandResult, error
113113
var args []string
114114
switch input.Command {
115115
case CommandBuild:
116-
args = []string{"rofl", "build"}
116+
args = []string{"rofl", "build", "--no-container"}
117117
case CommandPush:
118118
args = []string{"rofl", "push", "--format", "json"}
119119
case CommandValidate:

0 commit comments

Comments
 (0)