Merge pull request #6022 from iphoting/patch-1

Fix issue with docker plugin-list install failing boot for docker-based installations

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

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,14 +133,14 @@ 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
       echo $?
     )
+    echo "" && docker logs dokku
     if [[ $is_up -eq 0 ]]; then
-      echo "" && docker logs dokku
       break
     fi
     sleep 2