From 1adfb6f64797865884a90b9462fa1b41a9fbd003 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Thu, 23 Nov 2023 10:42:03 +0100 Subject: go: update to 1.20.11 and 1.21.4 1.22 release is expected in Feb 2024. We'll go 1.21 - 1.22 then. --- tools/docker/env/Dockerfile | 2 +- tools/docker/old-env/Dockerfile | 2 +- tools/docker/syzbot/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/docker') diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 87ae16c32..e9a1f0dcd 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -23,7 +23,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends apt-get clean autoclean && \ rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* -RUN curl https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz | tar -C /usr/local -xz +RUN curl https://dl.google.com/go/go1.21.4.linux-amd64.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin:/gopath/bin:$PATH ENV GOPATH /gopath diff --git a/tools/docker/old-env/Dockerfile b/tools/docker/old-env/Dockerfile index 27559d596..8a9471464 100644 --- a/tools/docker/old-env/Dockerfile +++ b/tools/docker/old-env/Dockerfile @@ -19,7 +19,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends apt-get clean autoclean && \ rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* -RUN curl https://dl.google.com/go/go1.19.6.linux-amd64.tar.gz | tar -C /usr/local -xz +RUN curl https://dl.google.com/go/go1.20.11.linux-amd64.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin:/gopath/bin:$PATH ENV GOPATH /gopath diff --git a/tools/docker/syzbot/Dockerfile b/tools/docker/syzbot/Dockerfile index 136cbf34e..9ecc590bf 100644 --- a/tools/docker/syzbot/Dockerfile +++ b/tools/docker/syzbot/Dockerfile @@ -26,7 +26,7 @@ RUN test "$(uname -m)" != x86_64 && exit 0 || \ g++-arm-linux-gnueabi g++-aarch64-linux-gnu g++-powerpc64le-linux-gnu \ g++-mips64el-linux-gnuabi64 g++-s390x-linux-gnu g++-riscv64-linux-gnu -RUN curl https://dl.google.com/go/go1.20.1.linux-$(uname -m | sed 's/aarch64/arm64/;s/x86_64/amd64/').tar.gz | tar -C /usr/local -xz +RUN curl https://dl.google.com/go/go1.21.4.linux-$(uname -m | sed 's/aarch64/arm64/;s/x86_64/amd64/').tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin:$PATH # The default clang-14 is too old, install the latest one. -- cgit mrf-deployment