diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9b969be499953..10b4efa7cbea3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -12,7 +12,7 @@ "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/go:1": { - "version": "1.24.12" + "version": "1.24.13" } }, diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml index edc5ae011efb5..f40057faf4e35 100644 --- a/.github/actions/install-go/action.yml +++ b/.github/actions/install-go/action.yml @@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve inputs: go-version: required: true - default: "1.24.12" + default: "1.24.13" description: "Go version to install" runs: diff --git a/.github/workflows/api-release.yml b/.github/workflows/api-release.yml index f3d9e69a4a082..6636811ae2574 100644 --- a/.github/workflows/api-release.yml +++ b/.github/workflows/api-release.yml @@ -6,7 +6,7 @@ on: name: API Release env: - GO_VERSION: "1.24.12" + GO_VERSION: "1.24.13" permissions: # added using https://github.com/step-security/secure-workflows contents: read diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fa85ddfd3d3a..5b579e32d4381 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -187,7 +187,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest] - go-version: ["1.24.12", "1.25.6"] + go-version: ["1.24.13", "1.25.7"] exclude: - os: ${{ github.event.repository.private && 'ubuntu-24.04-arm' || '' }} steps: diff --git a/.github/workflows/release/Dockerfile b/.github/workflows/release/Dockerfile index 330ff14ac29f6..3965ec699ed76 100644 --- a/.github/workflows/release/Dockerfile +++ b/.github/workflows/release/Dockerfile @@ -14,7 +14,7 @@ ARG UBUNTU_VERSION=22.04 ARG BASE_IMAGE=ubuntu:${UBUNTU_VERSION} -ARG GO_VERSION=1.24.12 +ARG GO_VERSION=1.24.13 ARG GO_IMAGE=golang:${GO_VERSION} FROM --platform=$BUILDPLATFORM $GO_IMAGE AS go FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 AS xx diff --git a/Vagrantfile b/Vagrantfile index 97cc3dd06c0d2..f3bc611450b76 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -107,7 +107,7 @@ EOF config.vm.provision "install-golang", type: "shell", run: "once" do |sh| sh.upload_path = "/tmp/vagrant-install-golang" sh.env = { - 'GO_VERSION': ENV['GO_VERSION'] || "1.24.12", + 'GO_VERSION': ENV['GO_VERSION'] || "1.24.13", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index baeb4059e1846..f55d8b6324596 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -34,7 +34,7 @@ # docker run --privileged --group-add keep-groups -v ./critest_exit_code.txt:/tmp/critest_exit_code.txt containerd-test # ------------------------------------------------------------------------------ -ARG GOLANG_VERSION=1.24.12 +ARG GOLANG_VERSION=1.24.13 ARG GOLANG_IMAGE=golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang @@ -146,24 +146,6 @@ COPY contrib/Dockerfile.test.d/critest.sh /critest.sh ENTRYPOINT ["/critest.sh","start"] -# Install proto3 -FROM golang AS proto3 -ARG DESTDIR=/build -RUN apt-get update && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - g++ \ - libtool \ - unzip \ - && rm -rf /var/lib/apt/lists/* - -COPY script/setup/install-protobuf install-protobuf -RUN ./install-protobuf \ - && mkdir -p $DESTDIR/usr/local/bin $DESTDIR/usr/local/include \ - && mv /usr/local/bin/protoc $DESTDIR/usr/local/bin/protoc \ - && mv /usr/local/include/google $DESTDIR/usr/local/include/google - FROM build-env AS dev -COPY --from=proto3 /build/ / COPY --from=runc /build/ / COPY . . diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go index 3701c90ede148..263c09d1bdf22 100644 --- a/contrib/apparmor/template.go +++ b/contrib/apparmor/template.go @@ -40,6 +40,8 @@ import ( const dir = "/etc/apparmor.d" const defaultTemplate = ` +abi , + {{range $value := .Imports}} {{$value}} {{end}} diff --git a/contrib/fuzz/oss_fuzz_build.sh b/contrib/fuzz/oss_fuzz_build.sh index 99651875688b7..7eba9d3d343bd 100755 --- a/contrib/fuzz/oss_fuzz_build.sh +++ b/contrib/fuzz/oss_fuzz_build.sh @@ -39,11 +39,11 @@ compile_fuzzers() { apt-get update && apt-get install -y wget cd $SRC -wget --quiet https://go.dev/dl/go1.24.12.linux-amd64.tar.gz +wget --quiet https://go.dev/dl/go1.24.13.linux-amd64.tar.gz mkdir temp-go rm -rf /root/.go/* -tar -C temp-go/ -xzf go1.24.12.linux-amd64.tar.gz +tar -C temp-go/ -xzf go1.24.13.linux-amd64.tar.gz mv temp-go/go/* /root/.go/ cd $SRC/containerd diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1 index 7123ef140913b..0e62560092ad7 100644 --- a/script/setup/prepare_env_windows.ps1 +++ b/script/setup/prepare_env_windows.ps1 @@ -5,7 +5,7 @@ # lived test environment. Set-MpPreference -DisableRealtimeMonitoring:$true -$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.24.12"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.24.13"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'