fix: match ubuntu tags on dogfood (#5996)

* 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.

* Fix sources
This commit is contained in:
Kyle Carberry
2023-02-02 13:58:53 -06:00
committed by GitHub
parent 496138b086
commit 2fab310ca4
7 changed files with 10 additions and 11 deletions
+2 -3
View File
@@ -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,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:jammy
SHELL ["/bin/bash", "-c"]
+3 -3
View File
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe
deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe