From 5e367eade0b5a279b55338f84a80336f6edc3de8 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 2 Dec 2022 21:11:03 +0000 Subject: [PATCH 1/8] feat: add lazygit to dogfood Dockerfile --- dogfood/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index a05a1266ad286..774cd84c46376 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -172,6 +172,12 @@ RUN apt-get update --quiet && apt-get install --yes \ RUN curl -L https://github.com/cli/cli/releases/download/v2.14.7/gh_2.14.7_linux_amd64.deb -o gh.deb && \ dpkg -i gh.deb +# Install Lazygit +# See https://github.com/jesseduffield/lazygit#ubuntu +RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v*([^"]+)".*/\1/') && \ + curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" && \ + sudo tar xf lazygit.tar.gz -C /usr/local/bin lazygit + # Install frontend utilities RUN apt-get update && \ # Node.js (from nodesource) and Yarn (from yarnpkg) From 375859a09d8ccdf6648fcb1937a64af175574827 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 2 Dec 2022 21:14:38 +0000 Subject: [PATCH 2/8] fix: use latest version of neovim in dogfood --- dogfood/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 774cd84c46376..b648e50d95ed9 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -172,6 +172,13 @@ RUN apt-get update --quiet && apt-get install --yes \ RUN curl -L https://github.com/cli/cli/releases/download/v2.14.7/gh_2.14.7_linux_amd64.deb -o gh.deb && \ dpkg -i gh.deb +# Install latest version of neovim +# Required by tools like LunarVim +RUN apt-get install -y software-properties-common && \ + add-apt-repository -y ppa:neovim-ppa/unstable && \ + apt-get update && \ + apt-get install -y neovim && \ + # Install Lazygit # See https://github.com/jesseduffield/lazygit#ubuntu RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v*([^"]+)".*/\1/') && \ From 24330dbfea626355b140128d4bfe46cd2f5bfc72 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 2 Dec 2022 21:15:43 +0000 Subject: [PATCH 3/8] fixup!: remove unnecssary sudo in lazygit lines --- dogfood/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index b648e50d95ed9..1ebe94c0dcc85 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -183,7 +183,7 @@ RUN apt-get install -y software-properties-common && \ # See https://github.com/jesseduffield/lazygit#ubuntu RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v*([^"]+)".*/\1/') && \ curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" && \ - sudo tar xf lazygit.tar.gz -C /usr/local/bin lazygit + tar xf lazygit.tar.gz -C /usr/local/bin lazygit # Install frontend utilities RUN apt-get update && \ From 98986f8696a9c98d38fc5e35d8fa6b74a3592fd5 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 2 Dec 2022 21:35:57 +0000 Subject: [PATCH 4/8] fixup!: only install neovim once --- dogfood/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 1ebe94c0dcc85..643538c60fd7f 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -143,7 +143,6 @@ RUN apt-get update --quiet && apt-get install --yes \ asciinema \ zsh \ ansible \ - neovim \ google-cloud-sdk \ google-cloud-sdk-datastore-emulator \ kubectl \ From f12eebe019fd3d9fbcbb7d430b0c3a455eb10e64 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 2 Dec 2022 21:41:24 +0000 Subject: [PATCH 5/8] feat: use coder dotfiles in dogfood template --- dogfood/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index c236ed9aec722..6bfe3f6262e0d 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -33,7 +33,7 @@ resource "coder_agent" "dev" { curl -fsSL https://code-server.dev/install.sh | sh code-server --auth none --port 13337 & sudo service docker start - if [ -f ~/personalize ]; then ~/personalize 2>&1 | tee ~/.personalize.log; fi + coder dotfiles -y 2>&1 | tee ~/.personalize.log EOF } From f075d192087be668b397eda42eab39d2f3bd275a Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 2 Dec 2022 21:44:35 +0000 Subject: [PATCH 6/8] Revert "fix: use latest version of neovim in dogfood" This reverts commit 4b81d91352f3f282b0d37b831984cbac3e9826e7. --- dogfood/Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 643538c60fd7f..89c88c9b6112d 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -171,13 +171,6 @@ RUN apt-get update --quiet && apt-get install --yes \ RUN curl -L https://github.com/cli/cli/releases/download/v2.14.7/gh_2.14.7_linux_amd64.deb -o gh.deb && \ dpkg -i gh.deb -# Install latest version of neovim -# Required by tools like LunarVim -RUN apt-get install -y software-properties-common && \ - add-apt-repository -y ppa:neovim-ppa/unstable && \ - apt-get update && \ - apt-get install -y neovim && \ - # Install Lazygit # See https://github.com/jesseduffield/lazygit#ubuntu RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v*([^"]+)".*/\1/') && \ From f1330f2c352babe05af5be0d9266762344889640 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 2 Dec 2022 21:44:43 +0000 Subject: [PATCH 7/8] Revert "fixup!: only install neovim once" This reverts commit bdd0201da460dceb0227ff93005f1f848be50942. --- dogfood/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 89c88c9b6112d..851e38db21160 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -143,6 +143,7 @@ RUN apt-get update --quiet && apt-get install --yes \ asciinema \ zsh \ ansible \ + neovim \ google-cloud-sdk \ google-cloud-sdk-datastore-emulator \ kubectl \ From 33ec6e54d7de20a177c9a7617ba3c27d3094ce7d Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 5 Dec 2022 20:37:17 +0000 Subject: [PATCH 8/8] chore: delete kubic (sorry Jonathan) fixup --- dogfood/Dockerfile | 6 ---- dogfood/files/etc/apt/preferences.d/kubic | 32 ------------------ .../files/etc/apt/sources.list.d/kubic.list | 1 - dogfood/files/usr/share/keyrings/kubic.gpg | Bin 723 -> 0 bytes 4 files changed, 39 deletions(-) delete mode 100644 dogfood/files/etc/apt/preferences.d/kubic delete mode 100644 dogfood/files/etc/apt/sources.list.d/kubic.list delete mode 100644 dogfood/files/usr/share/keyrings/kubic.gpg diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 851e38db21160..c96ee1fd2d78e 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -153,12 +153,6 @@ RUN apt-get update --quiet && apt-get install --yes \ docker-ce-cli \ packer \ terraform \ - buildah \ - conmon \ - containernetworking-plugins \ - crun \ - podman \ - skopeo \ fish \ unzip \ zstd && \ diff --git a/dogfood/files/etc/apt/preferences.d/kubic b/dogfood/files/etc/apt/preferences.d/kubic deleted file mode 100644 index e6cf704680eab..0000000000000 --- a/dogfood/files/etc/apt/preferences.d/kubic +++ /dev/null @@ -1,32 +0,0 @@ -# Ignore all packages from this repository by default -Package: * -Pin: origin download.opensuse.org -Pin-Priority: 1 - -# Dependencies of podman and buildah -Package: conmon -Pin: origin download.opensuse.org -Pin-Priority: 500 - -Package: containernetworking-plugins -Pin: origin download.opensuse.org -Pin-Priority: 500 - -Package: crun -Pin: origin download.opensuse.org -Pin-Priority: 500 - -# Buildah for building container images -Package: buildah -Pin: origin download.opensuse.org -Pin-Priority: 500 - -# Podman as a Docker alternative for running containers -Package: podman -Pin: origin download.opensuse.org -Pin-Priority: 500 - -# Skopeo for viewing container configuration and copying images -Package: skopeo -Pin: origin download.opensuse.org -Pin-Priority: 500 diff --git a/dogfood/files/etc/apt/sources.list.d/kubic.list b/dogfood/files/etc/apt/sources.list.d/kubic.list deleted file mode 100644 index e91654220a178..0000000000000 --- a/dogfood/files/etc/apt/sources.list.d/kubic.list +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/kubic.gpg] https://plug-mirror.rcac.purdue.edu/opensuse/repositories/devel%3A/kubic%3A/libcontainers%3A/stable/xUbuntu_20.04/ / diff --git a/dogfood/files/usr/share/keyrings/kubic.gpg b/dogfood/files/usr/share/keyrings/kubic.gpg deleted file mode 100644 index 9b827ee868e3425b3c5c81d9de2fd918e8222c0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 723 zcmV;^0xbQR0SyFOWLHN42msQxB*Gh-pkmzSS^TCQnz6_ybaGs5WgcF_Id>S| z321Cxs@a>W)@0{-S@fo*cv~p!jOe+3>AF&vk^&sIx_!!G&4q+LuOFrlL>gTj7hQ%L z1xucDnds6RvW2uPdv;*mBcIGlR}7D*vWpxYscD#gD&-Lo5xCQ#mt*kY3l%XH_#Jv& zrv3-!w{X&{p@2aYMjtDjGV|D*o$LBFTq?)*2A+h~a381|!{)svX`qx^_j_(F0oe^9 zA$==+FoC9CD;BHrXv5&2;AEGg7T>(WkzyCA{Y2&9=KXxn^UZAgATNvJUk?j=08fW^ zXHtJ|_oH=`b%I7m44D8C0RRECIAmpZWo$ZYbz*5_AWuS5AW(8|YGq?|AUtGcc4cfj zYjt92V?bhcX>4RJZ*XO9b9HlNE^l&YK8XQ71QP)W04N0lUvQF60viJb2?#3d2L=lX z2nPcK1{DYb2?`4Y76JnS0v-VZ7k~f?2@p+WIRkYD3Zxw|2mq$EB>Jx7;z6z@&@m~s zpRU}~TV?c>7=9lUh;mLc+s?4DsmdY5o5L#`DY&0G!C_W1*?I5jMHEd+KR_4RbkqC$ z_PpIsA^adYEH}!XtbuEYTu>tO))I{cfD0Dp7?)&(+j+m>9$pk)z_CG_4VtXpt6 z)5&9OH=zTn=}UWe6h6;Bbp`8fIHI;L(?llM4?Nskt3@caxk?!f?1JrgBMWrPj>O}l)!@lmeD7uMb6xJkB{3oi_ zC-0rPen;TAI;vjti87LZu&r8*bDnw{c~68m