From 9e4d213c2d818fc0cfa799f654b1063cc236ffe1 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 6 Dec 2022 03:11:44 -0700
Subject: [PATCH] feat: add lazygit, remove kubic, use dotfiles in dogfood
 image (#5271)

---
 dogfood/Dockerfile                            |  12 +++----
 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
 dogfood/main.tf                               |   2 +-
 5 files changed, 7 insertions(+), 40 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 a05a1266ad..c96ee1fd2d 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 && \
@@ -172,6 +166,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" && \
+  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)
diff --git a/dogfood/files/etc/apt/preferences.d/kubic b/dogfood/files/etc/apt/preferences.d/kubic
deleted file mode 100644
index e6cf704680..0000000000
--- 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 e91654220a..0000000000
--- 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<g@O>_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{<d>cfD0Dp7?)&(+j+m>9$pk)z_CG_4VtXpt6
z)5&9OH=zTn=}UWe6h6;Bbp`8fIHI;L(?l<Go*JM0RVO@drM|r|rMVH}yT`)`oP_94
z$VhbOMpQnU#>lM4?Nskt3@caxk?!f?1JrgBMWrPj>O}l)!@lmeD7uMb6xJkB{3oi_
zC-0rPen;TAI;vjti87LZu&r8*bDnw{c~68m<iF}rCijR&1QQVg00spDTVz*90162Z
zJ1`NqYn^2ysIvf_7mf`~-8~NoPZhIRghLzlJCEln0G~$O5WDUwXam4Z88WlbkZ&zM
F?`Iu_H{k#P

diff --git a/dogfood/main.tf b/dogfood/main.tf
index c236ed9aec..6bfe3f6262 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
 }