From c08e99248a1177d8af7269eb01cc33e3f17eaf7a Mon Sep 17 00:00:00 2001
From: Kazuhito Suda <kazuhito@fisuda.jp>
Date: Sun, 26 May 2024 06:59:18 +0900
Subject: [PATCH] Update docker installation procedure on Ubuntu

---
 CHANGELOG.md   |  1 +
 lets-fiware.sh | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42a7365..63e1eb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## FIWARE Big Bang v0.37.0-next
 
+-   Update docker installation procedure on Ubuntu (#365)
 -   Bump codecov/codecov-action from 1 to 4 (#364)
 -   Remove version property from docker compose files (#363)
 -   Update Orion to 3.12.0 (#362)
diff --git a/lets-fiware.sh b/lets-fiware.sh
index 0246015..62cd578 100755
--- a/lets-fiware.sh
+++ b/lets-fiware.sh
@@ -760,15 +760,18 @@ setup_firewall() {
 install_docker_ubuntu() {
   logging_info "${FUNCNAME[0]}"
 
+  # Add Docker's official GPG key:
   ${APT_GET} update
   ${APT_GET} install -y \
-      apt-transport-https \
       ca-certificates \
-      curl \
-      gnupg \
-      lsb-release
-  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | ${SUDO} gpg --dearmor --yes -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
+      curl
+  sudo install -m 0755 -d /etc/apt/keyrings
+  sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+  sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+  # Add the repository to Apt sources:
+  echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
   ${APT_GET} update
   ${APT_GET} install -y docker-ce docker-ce-cli containerd.io
   ${SYSTEMCTL} start docker