mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.1.x'
This commit is contained in:
commit
7511502471
@ -93,20 +93,9 @@ start_docker() {
|
||||
|
||||
export server_args DOCKER_LOG_FILE
|
||||
declare -fx try_start
|
||||
trap stop_docker EXIT
|
||||
|
||||
if ! timeout ${STARTUP_TIMEOUT} bash -ce 'while true; do try_start && break; done'; then
|
||||
echo Docker failed to start within ${STARTUP_TIMEOUT} seconds.
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
stop_docker() {
|
||||
local pid=$(cat /tmp/docker.pid)
|
||||
if [ -z "$pid" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
kill -TERM $pid
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user