Merge pull request #2261 from tonistiigi/daemonless-wait

daemonless: wait for daemon to finish before exit
2021-07-15 20:11:23 -07:00 · 2021-07-15 20:11:23 -07:00 · c8bb937807
parent dc397eae4a 9f0236add1
commit c8bb937807
1 changed files with 2 additions and 1 deletions
--- a/examples/buildctl-daemonless/buildctl-daemonless.sh
+++ b/examples/buildctl-daemonless/buildctl-daemonless.sh
@ -19,7 +19,7 @@ set -eu
 # * addr
 # * log
 tmp=$(mktemp -d /tmp/buildctl-daemonless.XXXXXX)
-trap "kill \$(cat $tmp/pid); rm -rf $tmp" EXIT
+trap "kill \$(cat $tmp/pid); wait \$(cat $tmp/pid) || true; rm -rf $tmp" EXIT

 startBuildkitd() {
    addr=
@ -57,3 +57,4 @@ waitForBuildkitd() {
 startBuildkitd
 waitForBuildkitd
 $BUILDCTL --addr=$(cat $tmp/addr) "$@"
+