Skip to content

[ws-daemon] Check runc download is a binary #13270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2022
Merged

[ws-daemon] Check runc download is a binary #13270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions components/ws-daemon/debug.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ RUN go get -u github.com/go-delve/delve/cmd/dlv

FROM alpine:3.16 as dl
WORKDIR /dl
RUN apk add --no-cache curl \
&& curl -OL https://github.com/opencontainers/runc/releases/download/v1.1.3/runc.amd64 \
&& chmod +x runc.amd64
RUN apk add --no-cache curl file \
&& curl -OsSL https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64 \
&& chmod +x runc.amd64 \
&& if ! file runc.amd64 | grep -iq "ELF 64-bit LSB executable"; then echo "runc.amd64 is not a binary file"; exit 1;fi

FROM ubuntu:22.04

## Installing coreutils is super important here as otherwise the loopback device creation fails!
ARG CLOUD_SDK_VERSION=390.0.0
ARG CLOUD_SDK_VERSION=402.0.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why upgrade? Is there something concrete in the changelog to handle EOF here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are already twelve versions behind. There are no breaking changes, and the SDK switched to python 3 as default.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Roger that, thank you for checking!

ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
ENV CLOUDSDK_CORE_DISABLE_PROMPTS=1

Expand Down
9 changes: 5 additions & 4 deletions components/ws-daemon/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@

FROM alpine:3.16 as dl
WORKDIR /dl
RUN apk add --no-cache curl \
&& curl -OL https://github.com/opencontainers/runc/releases/download/v1.1.3/runc.amd64 \
&& chmod +x runc.amd64
RUN apk add --no-cache curl file \
&& curl -OsSL https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64 \
&& chmod +x runc.amd64 \
&& if ! file runc.amd64 | grep -iq "ELF 64-bit LSB executable"; then echo "runc.amd64 is not a binary file"; exit 1;fi

FROM ubuntu:22.04

## Installing coreutils is super important here as otherwise the loopback device creation fails!
ARG CLOUD_SDK_VERSION=390.0.0
ARG CLOUD_SDK_VERSION=402.0.0
ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
ENV CLOUDSDK_CORE_DISABLE_PROMPTS=1

Expand Down