From 12d665aebddcc12b1239338f75e840ee6988c549 Mon Sep 17 00:00:00 2001
From: jwillmartin <jw.martin@outlook.com>
Date: Mon, 25 Mar 2024 17:08:49 -0400
Subject: [PATCH] 	modified:   configuration/arm64/docker-compose.yml 
 modified:   configuration/arm64/initialization.sh

---
 configuration/arm64/docker-compose.yml |  4 ++++
 configuration/arm64/initialization.sh  | 22 ++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/configuration/arm64/docker-compose.yml b/configuration/arm64/docker-compose.yml
index 47250f44e..47700e7c3 100644
--- a/configuration/arm64/docker-compose.yml
+++ b/configuration/arm64/docker-compose.yml
@@ -1,3 +1,5 @@
+version: '3.4'
+
 services:
   db:
     image: mariadb:10.4
@@ -14,6 +16,7 @@ services:
       - mysql_root_password
     volumes:
       - ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
+      ## uncomment line to enable port drayage database
       # - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
       - mysql-datavolume:/var/lib/mysql
 
@@ -42,6 +45,7 @@ services:
     volumes:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
+  ## uncomment section to enable port drayage service
   # port_drayage_webservice:
   #   image: usdotfhwaops/port-drayage-webservice_arm:latest
   #   container_name: port_drayage_webservice
diff --git a/configuration/arm64/initialization.sh b/configuration/arm64/initialization.sh
index 4372b82f4..6b0bfe1aa 100755
--- a/configuration/arm64/initialization.sh
+++ b/configuration/arm64/initialization.sh
@@ -35,14 +35,20 @@ fi
 
 #ARM initialization
 cd $directory
-sudo apt-get -y remove docker docker-engine docker.io containerd runc
-sudo apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common
-OS=$(lsb_release -i | awk 'FS=":" {print $3;}' | awk '{print tolower($0)}')
-arch=$(dpkg --print-architecture)
-curl -fsSL https://download.docker.com/linux/$OS/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=$arch] https://download.docker.com/linux/$OS $(lsb_release -cs) stable"
-sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin
-sudo apt update -y && sudo apt upgrade -y
+for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done
+# Add Docker's official GPG key:
+sudo apt-get -y install ca-certificates
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/debian/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/debian \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 sudo docker compose up -d
 
 #create v2xhub user