Merge pull request #2580 from 89luca89/fix_restart_alpine

fix: make restart script compatible with non-GNU userlands

Author: FabianKramm

e2e/tests/replacepods/replacepods.go

@@ -68,20 +68,20 @@ var _ = DevSpaceDescribe("replacepods", func() {
 		}()
 
 		// check if file is there
-		framework.ExpectRemoteFileContents("ubuntu", ns, "/app/test2.txt", "Hello World 123")
+		framework.ExpectRemoteFileContents("alpine", ns, "/app/test2.txt", "Hello World 123")
 
 		// check if file is there
-		framework.ExpectRemoteFileContents("ubuntu", ns, "/test.txt", "Hello World\n")
+		framework.ExpectRemoteFileContents("alpine", ns, "/test.txt", "Hello World\n")
 
 		// upload a file and restart the container
 		err = os.WriteFile("test1.txt", []byte("Hello World2!"), 0777)
 		framework.ExpectNoError(err)
 
 		// wait for uploaded
-		framework.ExpectRemoteFileContents("ubuntu", ns, "/app/test1.txt", "Hello World2!")
+		framework.ExpectRemoteFileContents("alpine", ns, "/app/test1.txt", "Hello World2!")
 
 		// wait for restarted
-		framework.ExpectRemoteFileContents("ubuntu", ns, "/test.txt", "Hello World\nHello World\n")
+		framework.ExpectRemoteFileContents("alpine", ns, "/test.txt", "Hello World\nHello World\n")
 
 		cancel()
 		err = <-done

e2e/tests/replacepods/testdata/restart-helper/devspace.yaml

@@ -4,9 +4,9 @@ name: attach
 pipelines:
   dev:
     run: |-
-      create_deployments test --set helm.values.containers[0].image=ubuntu
-      
-      start_dev test --set imageSelector=ubuntu \
+      create_deployments test --set helm.values.containers[0].image=alpine
+
+      start_dev test --set imageSelector=alpine \
                      --set 'command={sh,-c,echo Hello World >> /test.txt; sleep 100000}' \
                      --set logs.enabled=true \
                      --set sync[0].path=.:/app \

pkg/devspace/build/builder/restart/restart.go

@@ -54,11 +54,11 @@ quit() {
   if [ -f "$pidFile" ]; then
     pidToKill="$(cat $pidFile)"
     kill -2 $((0-$pidToKill)) >/dev/null 2>&1
-    timeout 5 tail --pid=$pidToKill -f /dev/null 2>&1
+    timeout 5 sh -c "while [ -e /proc/$pidToKill ]; do sleep 1; done"
     kill -15 $((0-$pidToKill)) >/dev/null 2>&1
-    timeout 5 tail --pid=$pidToKill -f /dev/null 2>&1
+    timeout 5 sh -c "while [ -e /proc/$pidToKill ]; do sleep 1; done"
     kill -9 $((0-$pidToKill)) >/dev/null 2>&1
-    timeout 5 tail --pid=$pidToKill -f /dev/null 2>&1
+    timeout 5 sh -c "while [ -e /proc/$pidToKill ]; do sleep 1; done"
   fi
 
   if [ -f "$ppidFile" ]; then
@@ -104,7 +104,16 @@ while $restart; do
     pid="$(cat $pidFile)"
 
     screen -q -S "${sid}" -X colon "logfile flush 1^M"
-    tail --pid=$pid -f "$screenLogFile"
+
+    tail -f "$screenLogFile" &
+    tailPid=$!
+    # This is a workaround on tail --pid not supported in all
+	# minimal shells
+    while [ -e /proc/$pid ]; do
+		# Until $pid exist, let's wait
+        sleep 1
+    done
+    kill $tailPid
   else
     setsid "$@" &
     pid=$!