From f8b9af4d61e40d290a5aa431f546512b4e613579 Mon Sep 17 00:00:00 2001
From: Daniel Velez <daniel@relentnet.com>
Date: Wed, 15 Jan 2025 14:40:43 -0600
Subject: [PATCH] Release v0.1.1: Docker installation and preloaded containers

---
 .../files/etc/preload-docker-images.sh                |  3 +--
 .../files/etc/start-portainer-container.sh            |  4 ++++
 .../files/etc/start-signalk-container.sh              |  3 +++
 .../etc/systemd/system/preload-docker-images.service  | 11 +++++++++++
 .../files/etc/systemd/system/start-containers.service |  6 +++---
 .../files/preload-docker-images.sh                    |  3 ++-
 .../files/start-portainer-container.sh                |  4 ++--
 .../files/start-signalk-container.sh                  |  1 -
 8 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100755 stage2/01-marinecomos-setup/files/etc/start-portainer-container.sh
 create mode 100755 stage2/01-marinecomos-setup/files/etc/start-signalk-container.sh
 create mode 100644 stage2/01-marinecomos-setup/files/etc/systemd/system/preload-docker-images.service

diff --git a/stage2/01-marinecomos-setup/files/etc/preload-docker-images.sh b/stage2/01-marinecomos-setup/files/etc/preload-docker-images.sh
index d2e9649..ffde0e7 100755
--- a/stage2/01-marinecomos-setup/files/etc/preload-docker-images.sh
+++ b/stage2/01-marinecomos-setup/files/etc/preload-docker-images.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
-# Load pre-downloaded Docker images
 docker load < /docker-images/portainer.tar
-docker load < /docker-images/signalr.tar
+docker load < /docker-images/signalk.tar
diff --git a/stage2/01-marinecomos-setup/files/etc/start-portainer-container.sh b/stage2/01-marinecomos-setup/files/etc/start-portainer-container.sh
new file mode 100755
index 0000000..1410682
--- /dev/null
+++ b/stage2/01-marinecomos-setup/files/etc/start-portainer-container.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+docker run -d --name portainer --restart=always -p 9000:9000 \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    -v /data:/data portainer/portainer-ce
diff --git a/stage2/01-marinecomos-setup/files/etc/start-signalk-container.sh b/stage2/01-marinecomos-setup/files/etc/start-signalk-container.sh
new file mode 100755
index 0000000..92a139a
--- /dev/null
+++ b/stage2/01-marinecomos-setup/files/etc/start-signalk-container.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+docker run -d --name signalk --restart=always -p 3000:3000 \
+    -v /var/lib/signalk:/data signalk/signalk-server
diff --git a/stage2/01-marinecomos-setup/files/etc/systemd/system/preload-docker-images.service b/stage2/01-marinecomos-setup/files/etc/systemd/system/preload-docker-images.service
new file mode 100644
index 0000000..b940308
--- /dev/null
+++ b/stage2/01-marinecomos-setup/files/etc/systemd/system/preload-docker-images.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Preload Docker Images
+After=docker.service
+
+[Service]
+Type=oneshot
+ExecStart=/etc/preload-docker-images.sh
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/stage2/01-marinecomos-setup/files/etc/systemd/system/start-containers.service b/stage2/01-marinecomos-setup/files/etc/systemd/system/start-containers.service
index d4f0618..896bd3d 100644
--- a/stage2/01-marinecomos-setup/files/etc/systemd/system/start-containers.service
+++ b/stage2/01-marinecomos-setup/files/etc/systemd/system/start-containers.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Start Docker Containers on First Boot
+Description=Start Docker Containers
 After=docker.service
-Requires=docker.service
 
 [Service]
 Type=oneshot
-ExecStart=/etc/start-docker-containers.sh
+ExecStart=/etc/start-portainer-container.sh
+ExecStart=/etc/start-signalk-container.sh
 RemainAfterExit=true
 
 [Install]
diff --git a/stage2/01-marinecomos-setup/files/preload-docker-images.sh b/stage2/01-marinecomos-setup/files/preload-docker-images.sh
index 9d6f8ab..ffde0e7 100755
--- a/stage2/01-marinecomos-setup/files/preload-docker-images.sh
+++ b/stage2/01-marinecomos-setup/files/preload-docker-images.sh
@@ -1,2 +1,3 @@
-docker load < /docker-images/signalk.tar
+#!/bin/bash
 docker load < /docker-images/portainer.tar
+docker load < /docker-images/signalk.tar
diff --git a/stage2/01-marinecomos-setup/files/start-portainer-container.sh b/stage2/01-marinecomos-setup/files/start-portainer-container.sh
index 69335f4..1410682 100755
--- a/stage2/01-marinecomos-setup/files/start-portainer-container.sh
+++ b/stage2/01-marinecomos-setup/files/start-portainer-container.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-# Start Portainer container
 docker run -d --name portainer --restart=always -p 9000:9000 \
-    -v /var/run/docker.sock:/var/run/docker.sock -v portainer_data:/data portainer/portainer-ce:latest
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    -v /data:/data portainer/portainer-ce
diff --git a/stage2/01-marinecomos-setup/files/start-signalk-container.sh b/stage2/01-marinecomos-setup/files/start-signalk-container.sh
index b32f892..92a139a 100755
--- a/stage2/01-marinecomos-setup/files/start-signalk-container.sh
+++ b/stage2/01-marinecomos-setup/files/start-signalk-container.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
-# Start SignalK container
 docker run -d --name signalk --restart=always -p 3000:3000 \
     -v /var/lib/signalk:/data signalk/signalk-server