From 249fa286bd215ed59e75f1b4dfde752774564e4d Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 2 Feb 2024 17:32:42 +0000 Subject: [PATCH 1/2] fix(dogfood/Dockerfile): switch apt sources list at the end of image build --- dogfood/Dockerfile | 3 +++ dogfood/files/etc/apt/{sources.list => sources.list.tsw} | 0 2 files changed, 3 insertions(+) rename dogfood/files/etc/apt/{sources.list => sources.list.tsw} (100%) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 2b2bc8897d32f..c76b682a8895c 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -337,6 +337,9 @@ COPY --from=rust-utils /tmp/bin /usr/local/bin COPY --from=proto /tmp/bin /usr/local/bin COPY --from=proto /tmp/include /usr/local/bin/include +# Switch to teraswitch mirrors for faster package installs at runtime. +RUN mv /etc/apt/sources.list.tsw /etc/apt/sources.list + USER coder # Ensure go bins are in the 'coder' user's path. Note that no go bins are diff --git a/dogfood/files/etc/apt/sources.list b/dogfood/files/etc/apt/sources.list.tsw similarity index 100% rename from dogfood/files/etc/apt/sources.list rename to dogfood/files/etc/apt/sources.list.tsw From 605005fdbd9715e4ab4cac30410b955e23b5cc34 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 6 Feb 2024 08:49:03 +0000 Subject: [PATCH 2/2] rm tsw sources.list entirely --- dogfood/Dockerfile | 3 --- dogfood/files/etc/apt/sources.list.tsw | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 dogfood/files/etc/apt/sources.list.tsw diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index c76b682a8895c..2b2bc8897d32f 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -337,9 +337,6 @@ COPY --from=rust-utils /tmp/bin /usr/local/bin COPY --from=proto /tmp/bin /usr/local/bin COPY --from=proto /tmp/include /usr/local/bin/include -# Switch to teraswitch mirrors for faster package installs at runtime. -RUN mv /etc/apt/sources.list.tsw /etc/apt/sources.list - USER coder # Ensure go bins are in the 'coder' user's path. Note that no go bins are diff --git a/dogfood/files/etc/apt/sources.list.tsw b/dogfood/files/etc/apt/sources.list.tsw deleted file mode 100644 index 745bcefcf2b0c..0000000000000 --- a/dogfood/files/etc/apt/sources.list.tsw +++ /dev/null @@ -1,3 +0,0 @@ -deb https://mirror.pit.teraswitch.com/ubuntu/ jammy main restricted universe -deb https://mirror.pit.teraswitch.com/ubuntu/ jammy-updates main restricted universe -deb https://mirror.pit.teraswitch.com/ubuntu/ jammy-backports main restricted universe