InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47335 from thaJeztah/containerd_binary_2.0.0-beta.2

Browse Source 
Dockerfile: test containerd v2.1.4
This commit is contained in:
Akihiro Suda
2025-10-22 17:16:30 +09:00
committed by GitHub
parent 9821df9b8e 68e1a8805b
commit 695a465211
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -163,7 +163,7 @@ RUN git init . && git remote add origin "https://github.com/containerd/container
# integration tests. The distributed docker .deb and .rpm packages depend on a # integration tests. The distributed docker .deb and .rpm packages depend on a
# separate (containerd.io) package, which may be a different version as is # separate (containerd.io) package, which may be a different version as is
# specified here. # specified here.
ARG CONTAINERD_VERSION=v1.7.28 ARG CONTAINERD_VERSION=v2.1.4
RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
FROM base AS containerd-build FROM base AS containerd-build

5
Dockerfile.windows
View File

@@ -168,7 +168,10 @@ ARG GOTESTSUM_VERSION=v1.13.0
# GOWINRES_VERSION is the version of go-winres to install. # GOWINRES_VERSION is the version of go-winres to install.
ARG GOWINRES_VERSION=v0.3.3 ARG GOWINRES_VERSION=v0.3.3
ARG CONTAINERD_VERSION=v1.7.28
# TODO: Update containerd version to match Linux version once
# https://github.com/microsoft/hcsshim/issues/2488 is resolved.
ARG CONTAINERD_VERSION=v2.0.6
# Environment variable notes: # Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

2
hack/dockerfile/install/containerd.installer
View File

@@ -10,7 +10,7 @@ set -e
# as is specified here. # as is specified here.
# #
# Generally, the commit specified here should match a tagged release. # Generally, the commit specified here should match a tagged release.
: "${CONTAINERD_VERSION:=v1.7.28}" : "${CONTAINERD_VERSION:=v2.1.4}"
install_containerd() ( install_containerd() (
echo "Install containerd version $CONTAINERD_VERSION" echo "Install containerd version $CONTAINERD_VERSION"