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 9b827ee868..0000000000 Binary files a/dogfood/files/usr/share/keyrings/kubic.gpg and /dev/null differ 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 }