From 3beccedca819bdb58358d7f4c8965bbba5293730 Mon Sep 17 00:00:00 2001
From: Rui Lopes <rgl@ruilopes.com>
Date: Fri, 26 Jun 2026 07:26:26 +0000
Subject: [PATCH] switch to the deb822-style format sources

---
 provision/provision-docker.sh   | 14 +++++++++++---
 provision/use-apt-repository.sh | 13 ++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/provision/provision-docker.sh b/provision/provision-docker.sh
index 5a04d9a..88651a3 100644
--- a/provision/provision-docker.sh
+++ b/provision/provision-docker.sh
@@ -26,11 +26,19 @@ apt-get update
 # install docker.
 # see https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/#install-using-the-repository
 apt-get install -y apt-transport-https software-properties-common
-wget -qO- https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/download.docker.com.gpg
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/download.docker.com.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" >/etc/apt/sources.list.d/docker.list
+wget -qO- https://download.docker.com/linux/ubuntu/gpg \
+    | gpg --dearmor -o /etc/apt/keyrings/download.docker.com.gpg
+cat >/etc/apt/sources.list.d/docker.sources <<EOF
+Types: deb
+Architectures: amd64
+Signed-By: /etc/apt/keyrings/download.docker.com.gpg
+URIs: https://download.docker.com/linux/ubuntu
+Suites: $(lsb_release -cs)
+Components: stable
+EOF
 apt-get update
 apt-cache madison docker-ce
-docker_package_version="$(apt-cache madison docker-ce | awk "/$docker_version/{print \$3}")"
+docker_package_version="$(apt-cache madison docker-ce | awk "/$docker_version/{print \$3}" | head -1)"
 apt-get install -y "docker-ce=$docker_package_version" "docker-ce-cli=$docker_package_version" containerd.io
 
 # configure it.
diff --git a/provision/use-apt-repository.sh b/provision/use-apt-repository.sh
index c676ea0..f02eb6f 100644
--- a/provision/use-apt-repository.sh
+++ b/provision/use-apt-repository.sh
@@ -39,12 +39,19 @@ EOF
 #    the best.
 bash -c "while [[ -z \"\$(wget -qO- https://$nexus_domain/repository/apt-hosted/dists/noble/Release | grep '/Packages$')\" ]]; do sleep 5; done"
 
-# import the apt-hosted key.
+# import the apt-hosted repository key.
 nexus_apt_hosted_keyring_path="/etc/apt/keyrings/$nexus_domain-apt-hosted.gpg"
 gpg --dearmor -o "$nexus_apt_hosted_keyring_path" </vagrant/shared/apt-hosted-public.key
 
-# configure the apt-hosted repository.
-echo "deb [arch=amd64 signed-by=$nexus_apt_hosted_keyring_path] https://$nexus_domain/repository/apt-hosted noble main" >"/etc/apt/sources.list.d/$nexus_domain-apt-hosted.list"
+# configure the apt-hosted repository sources.
+cat >"/etc/apt/sources.list.d/$nexus_domain-apt-hosted.sources" <<EOF
+Types: deb
+Architectures: amd64
+Signed-By: $nexus_apt_hosted_keyring_path
+URIs: https://$nexus_domain/repository/apt-hosted
+Suites: noble
+Components: main
+EOF
 apt-get update
 
 # install the hello-world package.