From 08f38892af3839dc5e4ad7afad02fbd48e7cd94d Mon Sep 17 00:00:00 2001
From: Ronald Ip <myself@iphoting.com>
Date: Mon, 10 Jul 2023 16:00:23 +0800
Subject: [PATCH 1/3] Fix issue with docker plugin-list install failing boot
 for docker-based installations

---
 docker/etc/my_init.d/10_dokku_init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/etc/my_init.d/10_dokku_init b/docker/etc/my_init.d/10_dokku_init
index e25dc78d1..6e5ad28e3 100755
--- a/docker/etc/my_init.d/10_dokku_init
+++ b/docker/etc/my_init.d/10_dokku_init
@@ -60,7 +60,7 @@ main() {
       if dokku plugin:installed "$plugin_name"; then
         log-warn "Skipping already installed plugin: $plugin_name"
       else
-        dokku plugin:install "$(echo "$line" | cut -d':' -f2)" --name "$plugin_name"
+        dokku plugin:install "$(echo "$line" | awk -F': ' '{print $2}')" --name "$plugin_name"
       fi
     done </mnt/dokku/plugin-list
   fi

From 204732ce3989b6dded7f96c080010b1658b01552 Mon Sep 17 00:00:00 2001
From: Ronald Ip <myself@iphoting.com>
Date: Fri, 14 Jul 2023 11:35:14 +0800
Subject: [PATCH 2/3] Test plugin-list within docker-based dokku installs. Cap
 docker container connectivity test iterations to 100.

---
 tests/ci/setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh
index cfed768b9..e9e55f320 100755
--- a/tests/ci/setup.sh
+++ b/tests/ci/setup.sh
@@ -115,6 +115,7 @@ build_dokku_docker_image() {
 
 run_dokku_container() {
   echo "=====> run_dokku_container on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
+  echo "redirect: https://github.com/dokku/dokku-redirect.git" | sudo tee /var/lib/dokku/plugin-list
   docker run -d \
     --env DOKKU_HOSTNAME=dokku.me \
     --name dokku \
@@ -132,7 +133,7 @@ check_container() {
   echo "=====> check_container on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
   local is_up
   local cnt=0
-  while true; do
+  while [ $cnt -lt 100 ]; do
     echo "$(date) [count: $cnt]: waiting for dokku startup"
     is_up=$(
       docker exec dokku ps -ef | grep "/usr/sbin/sshd -D" >/dev/null 2>&1

From 1ffb62ac829695786afca558e711d19b69c35c76 Mon Sep 17 00:00:00 2001
From: Ronald Ip <myself@iphoting.com>
Date: Fri, 14 Jul 2023 11:43:13 +0800
Subject: [PATCH 3/3] Test: Print docker container logs during startup.

---
 tests/ci/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh
index e9e55f320..a8ebd8448 100755
--- a/tests/ci/setup.sh
+++ b/tests/ci/setup.sh
@@ -139,8 +139,8 @@ check_container() {
       docker exec dokku ps -ef | grep "/usr/sbin/sshd -D" >/dev/null 2>&1
       echo $?
     )
+    echo "" && docker logs dokku
     if [[ $is_up -eq 0 ]]; then
-      echo "" && docker logs dokku
       break
     fi
     sleep 2