Skip to content

Commit ef9107d

Browse files
geroplona-agent
andcommitted
fix pipeline rot
Co-authored-by: Ona <no-reply@ona.com>
1 parent 0e7c548 commit ef9107d

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

dev/image/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ USER root
1212
# Pin Go version explicitly to ensure all CI-built binaries use a
1313
# non-vulnerable toolchain (CVE-2025-68121 requires >= 1.24.13).
1414
ENV GO_VERSION=1.24.13
15-
RUN curl -fsSL "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" | tar -C /usr/local -xz \
15+
RUN rm -rf /usr/local/go /home/gitpod/go /home/gitpod/.cache/go-build \
16+
&& curl -fsSL "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" | tar -C /usr/local -xz \
1617
&& ln -sf /usr/local/go/bin/go /usr/bin/go \
1718
&& ln -sf /usr/local/go/bin/gofmt /usr/bin/gofmt
19+
ENV GOROOT=/usr/local/go
1820
ENV PATH=/usr/local/go/bin:$PATH
1921

2022
### cloud_sql_proxy ###
@@ -264,7 +266,7 @@ RUN brew install tmux tmuxinator \
264266
&& brew install redis \
265267
# Install zed & spicedb CLI
266268
&& brew install authzed/tap/zed \
267-
&& brew install authzed/tap/spicedb \
269+
&& (brew install authzed/tap/spicedb || brew install authzed/tap/spicedb) \
268270
&& brew cleanup
269271

270272
# Copy our own tools
@@ -282,7 +284,10 @@ ENV PREVIEW_ENV_DEV_SA_KEY_PATH=/home/gitpod/.config/gcloud/preview-environment-
282284

283285
# So we can parse the report.html output by leeway, and remove the output produced by this image build
284286
# why? it's too verbose, exceeding the Github Actions summary limit
285-
RUN go install github.com/ericchiang/pup@v0.4.0
287+
RUN curl -fsSL https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip -o /tmp/pup.zip \
288+
&& sudo unzip -o /tmp/pup.zip -d /usr/local/bin \
289+
&& sudo chmod +x /usr/local/bin/pup \
290+
&& rm /tmp/pup.zip
286291

287292
# Install oci-tool
288293
RUN curl -fsSL https://github.com/csweichel/oci-tool/releases/download/v0.2.0/oci-tool_0.2.0_linux_amd64.tar.gz | sudo tar xz -C /usr/local/bin \

0 commit comments

Comments
 (0)