github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10110 from AkihiroSuda/go-mod-1.22

Browse Source 
go.mod: go 1.22
This commit is contained in:
Akihiro Suda 2024-04-30 09:19:17 +00:00 committed by GitHub
commit 53160fb4b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/install-go/action.yml vendored
View File

@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
inputs: inputs:
go-version: go-version:
required: true required: true
default: "1.21.9" default: "1.22.2"
description: "Go version to install" description: "Go version to install"
runs: runs:

2
.github/workflows/release.yml vendored
View File

@ -13,7 +13,7 @@ on:
name: Release name: Release
env: env:
GO_VERSION: "1.21.9" GO_VERSION: "1.22.2"
permissions: # added using https://github.com/step-security/secure-workflows permissions: # added using https://github.com/step-security/secure-workflows
contents: read contents: read

2
BUILDING.md
View File

@ -25,7 +25,7 @@ A codespace will open in a web-based version of Visual Studio Code. The [dev con
To build the `containerd` daemon, and the `ctr` simple test client, the following build system dependencies are required: To build the `containerd` daemon, and the `ctr` simple test client, the following build system dependencies are required:
* Go 1.21.x or above * Go 1.22.x or above
* Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/protocolbuffers/protobuf/releases)) * Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/protocolbuffers/protobuf/releases))
* Btrfs headers and libraries for your distribution. Note that building the btrfs driver can be disabled via the build tag `no_btrfs`, removing this dependency. * Btrfs headers and libraries for your distribution. Note that building the btrfs driver can be disabled via the build tag `no_btrfs`, removing this dependency.

2
Vagrantfile vendored
View File

@ -104,7 +104,7 @@ EOF
config.vm.provision "install-golang", type: "shell", run: "once" do |sh| config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang" sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = { sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.21.9", 'GO_VERSION': ENV['GO_VERSION'] || "1.22.2",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

2
contrib/Dockerfile.test
View File

@ -29,7 +29,7 @@
# docker run --privileged containerd-test # docker run --privileged containerd-test
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
ARG GOLANG_VERSION=1.21.9 ARG GOLANG_VERSION=1.22.2
ARG GOLANG_IMAGE=golang ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

4
contrib/fuzz/oss_fuzz_build.sh
View File

@ -43,11 +43,11 @@ go run main.go $SRC/containerd/images
apt-get update && apt-get install -y wget apt-get update && apt-get install -y wget
cd $SRC cd $SRC
wget --quiet https://go.dev/dl/go1.21.9.linux-amd64.tar.gz wget --quiet https://go.dev/dl/go1.22.2.linux-amd64.tar.gz
mkdir temp-go mkdir temp-go
rm -rf /root/.go/* rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.21.9.linux-amd64.tar.gz tar -C temp-go/ -xzf go1.22.2.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/ mv temp-go/go/* /root/.go/
cd $SRC/containerd cd $SRC/containerd

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/containerd/containerd/v2 module github.com/containerd/containerd/v2
go 1.21 go 1.22.0
require ( require (
dario.cat/mergo v1.0.0 dario.cat/mergo v1.0.0

11
script/setup/install-runc
View File

@ -34,11 +34,18 @@ function install_runc() {
: "${RUNC_REPO:=https://github.com/opencontainers/runc.git}" : "${RUNC_REPO:=https://github.com/opencontainers/runc.git}"
TMPROOT=$(mktemp -d) TMPROOT=$(mktemp -d)
# runc is incompatible with Go 1.22 on glibc-based distros
# https://github.com/opencontainers/runc/issues/4233
GO121DIR="${TMPROOT}"/go121
mkdir -p "${GO121DIR}"
GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.9@latest
GO121="${GO121DIR}"/go1.21.9
$GO121 download
git clone "${RUNC_REPO}" "${TMPROOT}"/runc git clone "${RUNC_REPO}" "${TMPROOT}"/runc
pushd "${TMPROOT}"/runc pushd "${TMPROOT}"/runc
git checkout "${RUNC_VERSION}" git checkout "${RUNC_VERSION}"
make BUILDTAGS='seccomp' runc make GO=$GO121 BUILDTAGS='seccomp' runc
$SUDO make install $SUDO make GO=$GO121 install
popd popd
rm -fR "${TMPROOT}" rm -fR "${TMPROOT}"
} }

2
script/setup/prepare_env_windows.ps1
View File

@ -5,7 +5,7 @@
# lived test environment. # lived test environment.
Set-MpPreference -DisableRealtimeMonitoring:$true Set-MpPreference -DisableRealtimeMonitoring:$true
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.9"; make = ""; nssm = "" } $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.22.2"; make = ""; nssm = "" }
Write-Host "Downloading chocolatey package" Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip' curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'