From 794347453933d0bb16bce22de70e99f5e184edad Mon Sep 17 00:00:00 2001
From: Kat Morgan <kat@braincraft.io>
Date: Wed, 10 Jan 2024 22:12:12 -0800
Subject: [PATCH] add kubectl

---
 Dockerfile | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 61820be..fb4fb99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,31 +64,8 @@ docker-ce-cli \
 "
 RUN set -ex \
     && sudo apt-get update \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
-    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list \
-    && sudo apt-get update \
-    && sudo apt-get install ${APT_PKGS} \
-    && sudo apt-get clean \
-    && sudo apt-get autoremove -y \
-    && sudo apt-get purge -y --auto-remove \
-    && sudo rm -rf \
-        /var/lib/{apt,dpkg,cache,log} \
-        /usr/share/{doc,man,locale} \
-        /var/cache/apt \
-        /root/.cache \
-        /var/tmp/* \
-        /tmp/* \
-    && true
-
-# Install docker packages for codespaces docker-in-docker
-ARG APT_PKGS="\
-docker-buildx-plugin \
-docker-ce-cli \
-"
-RUN set -ex \
-    && sudo apt-get update \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
-    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --batch --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
     && sudo apt-get update \
     && sudo apt-get install ${APT_PKGS} \
     && sudo apt-get clean \
@@ -283,7 +260,7 @@ RUN set -ex \
 RUN set -ex \
     && export NODE_MAJOR=20 \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
-        | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+        | sudo gpg --batch --dearmor -o /etc/apt/keyrings/nodesource.gpg \
     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" \
         | sudo tee /etc/apt/sources.list.d/nodesource.list \
     && sudo apt-get update \