Skip to content

[tooling] Improve reliability of make start-locally #1565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenjaminPelletier wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

[tooling] Improve reliability of make start-locally #1565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions build/dev/run_locally.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,18 @@ if [[ "$DC_COMMAND" == up* ]]; then
check_and_connect() {
local container=$1
local network=$2
if docker ps --format '{{.Names}}' | grep -q "^${container}$"; then
if docker ps -a --format '{{.Names}}' | grep -q "^${container}$"; then
if ! docker inspect "${container}" --format '{{json .NetworkSettings.Networks}}' | grep -q "\"${network}\""; then
echo "Warning: Container ${container} is not connected to ${network}. Reconnecting and restarting so the entrypoint reapplies traffic shaping..."
docker network connect "${network}" "${container}"
local status
status=$(docker inspect --format '{{.State.Status}}' "${container}" 2>/dev/null || true)
if [ "$status" = "restarting" ] || [ "$status" = "running" ]; then
docker stop -t 2 "${container}" >/dev/null 2>&1 || true
fi
docker network connect "${network}" "${container}" || {
docker stop -t 2 "${container}" >/dev/null 2>&1 || true
docker network connect "${network}" "${container}"
}
docker restart "${container}"
fi
fi
Expand Down
Loading