Skip to content

fix: match ubuntu tags on dogfood #5996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 2, 2023
Merged

fix: match ubuntu tags on dogfood #5996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c24935
fix: match ubuntu tags on dogfood
kylecarbs Feb 2, 2023
b49e23a
Fix sources
kylecarbs Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions dogfood/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"]

Expand Down
6 changes: 3 additions & 3 deletions dogfood/files/etc/apt/sources.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion dogfood/files/etc/apt/sources.list.d/docker.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion dogfood/files/etc/apt/sources.list.d/hashicorp.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion dogfood/files/etc/apt/sources.list.d/nodesource.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion dogfood/files/etc/apt/sources.list.d/postgresql.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion dogfood/files/etc/apt/sources.list.d/security.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe
deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe