From dea6367187f599a227ff4b23179e63dbfa2e2f74 Mon Sep 17 00:00:00 2001
From: Sam Clark <1059176+samhclark@users.noreply.github.com>
Date: Sat, 28 Sep 2024 11:17:12 -0500
Subject: [PATCH] Replace Docker Desktop with docker cli on host

---
 Containerfile                 | 13 -------------
 checksums                     |  1 -
 docker-ce.repo                |  6 ------
 docker-release-public-key.asc | 28 ----------------------------
 packages.json                 | 12 ++----------
 5 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 checksums
 delete mode 100644 docker-ce.repo
 delete mode 100644 docker-release-public-key.asc

diff --git a/Containerfile b/Containerfile
index 348d8c9..770fbb3 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,27 +1,14 @@
 ARG silverblue_version=40
 FROM quay.io/fedora-ostree-desktops/silverblue:${silverblue_version}
 
-COPY docker-ce.repo /etc/yum.repos.d/docker-ce.repo
-COPY docker-release-public-key.asc /etc/pki/rpm-gpg/docker-release-public-key.asc
 COPY vscode.repo /etc/yum.repos.d/vscode.repo
 COPY microsoft-release-public-key.asc /etc/pki/rpm-gpg/microsoft-release-public-key.asc
 
-ADD https://desktop.docker.com/linux/main/amd64/160616/docker-desktop-x86_64.rpm /docker-desktop-x86_64.rpm
-RUN --mount=type=bind,source=checksums,target=/checksums,z sha256sum -c checksums
-
-# Copying the pattern for installing Docker Desktop from here
-# https://github.com/coreos/rpm-ostree/issues/233#issuecomment-1301194050
-# There have been updates since this was written in Nov 2022 but as of July 2024, this is still the
-# recommended way https://github.com/coreos/fedora-coreos-tracker/issues/1681#issuecomment-2211137520
 RUN --mount=type=bind,source=packages.json,target=/packages.json,z \
     rpm-ostree override remove \
         $(jq -r '"--install=\(.add[].name)"' /packages.json | xargs) \
         $(jq -r '.remove[].name' /packages.json | xargs) \
     && systemctl enable rpm-ostreed-automatic.timer \
-    && mkdir /var/opt \
-    && rpm -Uvh docker-desktop-x86_64.rpm \
-    && mv /var/opt/docker-desktop /usr/lib/opt/docker-desktop \
-    && echo 'L /opt/docker-desktop - - - - ../../usr/lib/opt/docker-desktop' > /usr/lib/tmpfiles.d/docker-desktop.conf \
     && rpm-ostree cleanup --repomd
 
 RUN ostree container commit
diff --git a/checksums b/checksums
deleted file mode 100644
index 1b1eb05..0000000
--- a/checksums
+++ /dev/null
@@ -1 +0,0 @@
-ba644d1ec8749e50863badf56620c453544b82f917ac13eb03f8c5c105825fb4	docker-desktop-x86_64.rpm
diff --git a/docker-ce.repo b/docker-ce.repo
deleted file mode 100644
index e151537..0000000
--- a/docker-ce.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[docker-ce-stable]
-name=Docker CE Stable - $basearch
-baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/docker-release-public-key.asc
diff --git a/docker-release-public-key.asc b/docker-release-public-key.asc
deleted file mode 100644
index 1967cbf..0000000
--- a/docker-release-public-key.asc
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFit5IEBEADDt86QpYKz5flnCsOyZ/fk3WwBKxfDjwHf/GIflo+4GWAXS7wJ
-1PSzPsvSDATV10J44i5WQzh99q+lZvFCVRFiNhRmlmcXG+rk1QmDh3fsCCj9Q/yP
-w8jn3Hx0zDtz8PIB/18ReftYJzUo34COLiHn8WiY20uGCF2pjdPgfxE+K454c4G7
-gKFqVUFYgPug2CS0quaBB5b0rpFUdzTeI5RCStd27nHCpuSDCvRYAfdv+4Y1yiVh
-KKdoe3Smj+RnXeVMgDxtH9FJibZ3DK7WnMN2yeob6VqXox+FvKYJCCLkbQgQmE50
-uVK0uN71A1mQDcTRKQ2q3fFGlMTqJbbzr3LwnCBE6hV0a36t+DABtZTmz5O69xdJ
-WGdBeePCnWVqtDb/BdEYz7hPKskcZBarygCCe2Xi7sZieoFZuq6ltPoCsdfEdfbO
-+VBVKJnExqNZCcFUTEnbH4CldWROOzMS8BGUlkGpa59Sl1t0QcmWlw1EbkeMQNrN
-spdR8lobcdNS9bpAJQqSHRZh3cAM9mA3Yq/bssUS/P2quRXLjJ9mIv3dky9C3udM
-+q2unvnbNpPtIUly76FJ3s8g8sHeOnmYcKqNGqHq2Q3kMdA2eIbI0MqfOIo2+Xk0
-rNt3ctq3g+cQiorcN3rdHPsTRSAcp+NCz1QF9TwXYtH1XV24A6QMO0+CZwARAQAB
-tCtEb2NrZXIgUmVsZWFzZSAoQ0UgcnBtKSA8ZG9ja2VyQGRvY2tlci5jb20+iQI3
-BBMBCgAhBQJYrep4AhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEMUv62ti
-Hp816C0P/iP+1uhSa6Qq3TIc5sIFE5JHxOO6y0R97cUdAmCbEqBiJHUPNQDQaaRG
-VYBm0K013Q1gcJeUJvS32gthmIvhkstw7KTodwOM8Kl11CCqZ07NPFef1b2SaJ7l
-TYpyUsT9+e343ph+O4C1oUQw6flaAJe+8ATCmI/4KxfhIjD2a/Q1voR5tUIxfexC
-/LZTx05gyf2mAgEWlRm/cGTStNfqDN1uoKMlV+WFuB1j2oTUuO1/dr8mL+FgZAM3
-ntWFo9gQCllNV9ahYOON2gkoZoNuPUnHsf4Bj6BQJnIXbAhMk9H2sZzwUi9bgObZ
-XO8+OrP4D4B9kCAKqqaQqA+O46LzO2vhN74lm/Fy6PumHuviqDBdN+HgtRPMUuao
-xnuVJSvBu9sPdgT/pR1N9u/KnfAnnLtR6g+fx4mWz+ts/riB/KRHzXd+44jGKZra
-IhTMfniguMJNsyEOO0AN8Tqcl0eRBxcOArcri7xu8HFvvl+e+ILymu4buusbYEVL
-GBkYP5YMmScfKn+jnDVN4mWoN1Bq2yMhMGx6PA3hOvzPNsUoYy2BwDxNZyflzuAi
-g59mgJm2NXtzNbSRJbMamKpQ69mzLWGdFNsRd4aH7PT7uPAURaf7B5BVp3UyjERW
-5alSGnBqsZmvlRnVH5BDUhYsWZMPRQS9rRr4iGW0l+TH+O2VJ8aQ
-=0Zqq
------END PGP PUBLIC KEY BLOCK-----
diff --git a/packages.json b/packages.json
index bdb277b..d1e23a0 100644
--- a/packages.json
+++ b/packages.json
@@ -4,10 +4,6 @@
         "name": "code",
         "_comment": "Visual Studio Code needs to be on the host because it's an Electron app"
       },
-      {
-        "name": "docker-ce-cli",
-        "_comment": "Required for Docker Desktop"
-      },
       {
         "name": "gcc",
         "_comment": "Required for Homebrew"
@@ -20,10 +16,6 @@
         "name": "gnome-tweaks",
         "_comment": "Lets me put the titlebar buttons on the left"
       },
-      {
-        "name": "gtk3-devel",
-        "_comment": "Required for Docker Desktop"
-      },
       {
         "name": "guestfs-tools",
         "_comment": "Optiional package of Virtualization group"
@@ -45,8 +37,8 @@
         "_comment": "Needed to prompt for PIN for TPM-bound SSH keys"
       },
       {
-        "name": "pass",
-        "_comment": "Required for Docker Desktop"
+        "name": "docker",
+        "_comment": "Installs containerd, moby-engine, and runc"
       },
       {
         "name": "powertop",