From 5c24935033ea6456cf98da6c50443aee5735a1e6 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 2 Feb 2023 19:52:16 +0000 Subject: [PATCH 1/2] fix: match ubuntu tags on dogfood golangci-lint needs GLIBC>=2.32 which made me notice that we're building binaries on a difference Ubuntu version than we dev on. --- dogfood/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index cccededb5734c..36a1b0315db85 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -80,8 +80,7 @@ RUN apk add curl unzip RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v21.5/protoc-21.5-linux-x86_64.zip RUN unzip protoc.zip -# Ubuntu 20.04 LTS (Focal Fossa) -FROM ubuntu:focal +FROM ubuntu SHELL ["/bin/bash", "-c"] From b49e23a380108465195b2f1c5000aa0268eaeaea Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 2 Feb 2023 19:55:14 +0000 Subject: [PATCH 2/2] Fix sources --- dogfood/Dockerfile | 4 ++-- dogfood/files/etc/apt/sources.list | 6 +++--- dogfood/files/etc/apt/sources.list.d/docker.list | 2 +- dogfood/files/etc/apt/sources.list.d/hashicorp.list | 2 +- dogfood/files/etc/apt/sources.list.d/nodesource.list | 2 +- dogfood/files/etc/apt/sources.list.d/postgresql.list | 2 +- dogfood/files/etc/apt/sources.list.d/security.list | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 36a1b0315db85..73639e361f3a2 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -4,7 +4,7 @@ FROM rust:slim AS rust-utils ENV CARGO_INSTALL_ROOT=/tmp/ RUN cargo install exa bat ripgrep typos-cli watchexec-cli -FROM ubuntu AS go +FROM ubuntu:jammy AS go RUN apt-get update && apt-get install --yes curl gcc # Install Go manually, so that we can control the version @@ -80,7 +80,7 @@ RUN apk add curl unzip RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v21.5/protoc-21.5-linux-x86_64.zip RUN unzip protoc.zip -FROM ubuntu +FROM ubuntu:jammy SHELL ["/bin/bash", "-c"] diff --git a/dogfood/files/etc/apt/sources.list b/dogfood/files/etc/apt/sources.list index f717d44b63489..0285faf24f787 100644 --- a/dogfood/files/etc/apt/sources.list +++ b/dogfood/files/etc/apt/sources.list @@ -1,3 +1,3 @@ -deb http://mirror.pit.teraswitch.com/ubuntu/ focal main restricted universe -deb http://mirror.pit.teraswitch.com/ubuntu/ focal-updates main restricted universe -deb http://mirror.pit.teraswitch.com/ubuntu/ focal-backports main restricted universe +deb http://mirror.pit.teraswitch.com/ubuntu/ jammy main restricted universe +deb http://mirror.pit.teraswitch.com/ubuntu/ jammy-updates main restricted universe +deb http://mirror.pit.teraswitch.com/ubuntu/ jammy-backports main restricted universe diff --git a/dogfood/files/etc/apt/sources.list.d/docker.list b/dogfood/files/etc/apt/sources.list.d/docker.list index 256f965403842..f00cada1ad16e 100644 --- a/dogfood/files/etc/apt/sources.list.d/docker.list +++ b/dogfood/files/etc/apt/sources.list.d/docker.list @@ -1 +1 @@ -deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu focal stable +deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu jammy stable diff --git a/dogfood/files/etc/apt/sources.list.d/hashicorp.list b/dogfood/files/etc/apt/sources.list.d/hashicorp.list index b8f005e09f6bc..6e60053905ec7 100644 --- a/dogfood/files/etc/apt/sources.list.d/hashicorp.list +++ b/dogfood/files/etc/apt/sources.list.d/hashicorp.list @@ -1 +1 @@ -deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com focal main +deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com jammy main diff --git a/dogfood/files/etc/apt/sources.list.d/nodesource.list b/dogfood/files/etc/apt/sources.list.d/nodesource.list index 02b870094dd1e..9387e744dd54a 100644 --- a/dogfood/files/etc/apt/sources.list.d/nodesource.list +++ b/dogfood/files/etc/apt/sources.list.d/nodesource.list @@ -1 +1 @@ -deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x focal main +deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x jammy main diff --git a/dogfood/files/etc/apt/sources.list.d/postgresql.list b/dogfood/files/etc/apt/sources.list.d/postgresql.list index ffa56625fac68..10262f3e64a10 100644 --- a/dogfood/files/etc/apt/sources.list.d/postgresql.list +++ b/dogfood/files/etc/apt/sources.list.d/postgresql.list @@ -1 +1 @@ -deb [signed-by=/usr/share/keyrings/postgresql.gpg] https://apt.postgresql.org/pub/repos/apt focal-pgdg main +deb [signed-by=/usr/share/keyrings/postgresql.gpg] https://apt.postgresql.org/pub/repos/apt jammy-pgdg main diff --git a/dogfood/files/etc/apt/sources.list.d/security.list b/dogfood/files/etc/apt/sources.list.d/security.list index 38a566b0932b4..1f3dae8d09b19 100644 --- a/dogfood/files/etc/apt/sources.list.d/security.list +++ b/dogfood/files/etc/apt/sources.list.d/security.list @@ -1 +1 @@ -deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe +deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe