diff --git a/src/ubuntu-example/docker-compose.yaml b/src/ubuntu-example/docker-compose.yaml index 10d7ecab..e31521ba 100644 --- a/src/ubuntu-example/docker-compose.yaml +++ b/src/ubuntu-example/docker-compose.yaml @@ -3,7 +3,7 @@ services: # The container name must be "application-server" container_name: "application-server" # This can be either a pre-existing image or built from a Dockerfile - image: "mcr.microsoft.com/devcontainers/base:ubuntu" + image: "mcr.microsoft.com/devcontainers/base:ubuntu-24.04" # build: # context: . restart: always diff --git a/startupscript/butane/probe-proxy-readiness.sh b/startupscript/butane/probe-proxy-readiness.sh index d124a516..77ddff78 100644 --- a/startupscript/butane/probe-proxy-readiness.sh +++ b/startupscript/butane/probe-proxy-readiness.sh @@ -11,7 +11,7 @@ set -o xtrace # shellcheck source=/dev/null source /home/core/metadata-utils.sh -APP_HEALTH="$(docker inspect --format='{{.State.Health.Status}}' application-server 2>/dev/null || echo "none")" +APP_HEALTH="$( (docker inspect --format='{{.State.Health.Status}}' application-server 2>/dev/null || echo "none") | xargs)" if docker ps -q --filter "name=proxy-agent" | grep -q . \ && docker ps -q --filter "name=application-server" | grep -q . \