Merge remote-tracking branch 'upstream/main' into dev-1.24

2022-05-02 10:29:49 -07:00
parent 7f13ad092c a8b640bd6f
commit 5ead53b3e8
141 changed files with 5085 additions and 666 deletions
@@ -59,7 +59,7 @@ and restarts it.
 When the container starts, it executes this command:

 ```shell
-/bin/sh -c "touch /tmp/healthy; sleep 30; rm -rf /tmp/healthy; sleep 600"
+/bin/sh -c "touch /tmp/healthy; sleep 30; rm -f /tmp/healthy; sleep 600"
 ```

 For the first 30 seconds of the container's life, there is a `/tmp/healthy` file.