Skip to content
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

runc rc94 take two #2251

Merged
merged 3 commits into from
May 18, 2021
Merged

runc rc94 take two #2251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ad81b2
update containerd shasums for fixed release build
BenTheElder May 18, 2021
51cf6f7
bump base image
BenTheElder May 18, 2021
3ea54cf
bump node image
BenTheElder May 18, 2021
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
12 changes: 6 additions & 6 deletions images/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ ARG TARGETARCH
ARG CONTAINERD_VERSION="1.5.1"
ARG CONTAINERD_BASE_URL="https://github.com/kind-ci/containerd-nightlies/releases/download/containerd-${CONTAINERD_VERSION}"
ARG CONTAINERD_URL="${CONTAINERD_BASE_URL}/containerd-${CONTAINERD_VERSION}.linux-${TARGETARCH}.tar.gz"
ARG CONTAINERD_AMD64_SHA256SUM="bb3c6803e68f296b334d5ed1fa32fc25365c1b39e0c91f8dddcd53eb8b369426"
ARG CONTAINERD_ARM64_SHA256SUM="aa1251b16ca2ae57a93fd3db5dd34478740bbdf830fede625ead6b3f9cb5a4c2"
ARG CONTAINERD_PPC64LE_SHA256SUM="f9f2dd92da2760a97b1848a23653e1dd5fe202f3ccaeef26e9221f3f03c84bcf"
ARG CONTAINERD_AMD64_SHA256SUM="1852b73687fb4ee0ab25426c909c5d38f6f123281a29e657dffbf569169c6d53"
ARG CONTAINERD_ARM64_SHA256SUM="a800c384a4382feb3bbe2ea14fce2672c2c11cb64e7ba2f6a0c2b84f2d24fef7"
ARG CONTAINERD_PPC64LE_SHA256SUM="220cc93a4f5c6a4fc702bd23b5a32faa0b25cf2e754ae2b330ce325a70c67d6f"

ARG RUNC_URL="${CONTAINERD_BASE_URL}/runc.${TARGETARCH}"
ARG RUNC_AMD64_SHA256SUM="60c2a09e57a29795005b0a64c4ba7d5668da4750ef24f80be61fb60e6c9aff93"
ARG RUNC_ARM64_SHA256SUM="90cc62a5ccc8f3ef20ee8209a9b0b4457daf9f91b436e23aa7fd38cccb133254"
ARG RUNC_PPC64LE_SHA256SUM="cdb2a58534c859d2bfd61c90f64c05b7c9823b2448abeca95685c59104febc71"
ARG RUNC_AMD64_SHA256SUM="b9277b5f9a8f6e5576b17d2d666ab217c7c8e2bbd34f845c42f56fd22952610c"
ARG RUNC_ARM64_SHA256SUM="b892af427845a7044dd1f3f04637bccd8e835772e5c2b952bf0eb1aba4c946b4"
ARG RUNC_PPC64LE_SHA256SUM="8e80093c39f27cd3640158e180be034687852bf38f26e21b90627288ae084a22"

# Configure crictl binary from upstream
ARG CRICTL_VERSION="v1.21.0"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/config/defaults/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ limitations under the License.
package defaults

// Image is the default for the Config.Image field, aka the default node image.
const Image = "kindest/node:v1.21.1@sha256:c6eead46eaba71017e290f696fa675187133d7953e9291900e384f711b6cf8ed"
const Image = "kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad"
2 changes: 1 addition & 1 deletion pkg/build/nodeimage/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ package nodeimage
const DefaultImage = "kindest/node:latest"

// DefaultBaseImage is the default base image used
const DefaultBaseImage = "docker.io/kindest/base:v20210513-60cf6961"
const DefaultBaseImage = "docker.io/kindest/base:v20210517-8ad81b23"