From d0729aa82aea728ce569a66a57b2918b7789577a Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 30 Sep 2025 16:03:43 +0200
Subject: [PATCH] Update docker-vm.sh

---
 vm/docker-vm.sh | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/vm/docker-vm.sh b/vm/docker-vm.sh
index c095e3b2..cb48174c 100644
--- a/vm/docker-vm.sh
+++ b/vm/docker-vm.sh
@@ -459,27 +459,15 @@ packages:
   - curl
   - gnupg
   - qemu-guest-agent
-  - cloud-guest-utils   # growpart/resizefs
-  - cloud-init
-
-write_files:
-  - path: /etc/apt/keyrings/docker.gpg
-    permissions: '0644'
-    encoding: b64
-    content: ${DOCKER_GPG_B64}
+  - cloud-guest-utils
 
 runcmd:
-  - sed -i 's#^ENV_SUPATH.*#ENV_SUPATH  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin#' /etc/login.defs || true
-  - sed -i 's#^ENV_PATH.*#ENV_PATH    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin#' /etc/login.defs || true
-  - printf 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\n' > /etc/environment
-  - "grep -q 'export PATH=' /root/.bashrc || echo 'export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' >> /root/.bashrc"
-
   - install -m 0755 -d /etc/apt/keyrings
+  - curl -fsSL ${DOCKER_BASE}/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+  - chmod a+r /etc/apt/keyrings/docker.gpg
   - echo "deb [arch=\$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] ${DOCKER_BASE} ${REPO_CODENAME} stable" > /etc/apt/sources.list.d/docker.list
-
   - apt-get update -qq
   - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
-
   - systemctl enable --now qemu-guest-agent
   - systemctl enable --now docker