Reinstate docker installation

* build-files/install-packages.sh
  - Reinstate docker installation

* build-files/supported_packages.txt
  - Remove podman-docker from package list so it doesn't conflict with "real" docker

Author: nealef

build-files/install-packages.sh

@@ -29,6 +29,22 @@ header "Installing additional packages"
 msg "Updating package list..."
 sudo DEBIAN_FRONTEND=noninteractive apt-get update -y >/dev/null
 
+# installing docker
+for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done
+
+# Add Docker's official GPG key:
+sudo DEBIAN_FRONTEND=noninteractive apt-get update -y
+sudo DEBIAN_FRONTEND=noninteractive apt-get install ca-certificates curl -y
+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
+
 # Read the file line by line and install each package
 OK=`true`
 while IFS= read -r package || [ -n "$package" ]; do

build-files/supported_packages.txt

@@ -75,7 +75,6 @@ pipx
 pkg-config
 podman
 podman-compose
-podman-docker
 podman-remote
 podman-toolbox
 pollinate