diff --git a/elixir/Dockerfile b/elixir/Dockerfile index 7af92b951..a761870d3 100644 --- a/elixir/Dockerfile +++ b/elixir/Dockerfile @@ -280,6 +280,7 @@ RUN set -xe \ # Install Firezone runtime deps && apk add --no-cache --update-cache \ curl \ + jq \ tini # Create default user and home directory, set owner to default diff --git a/elixir/rel/env.sh.eex b/elixir/rel/env.sh.eex index ee4fc44d6..b69204336 100644 --- a/elixir/rel/env.sh.eex +++ b/elixir/rel/env.sh.eex @@ -30,6 +30,8 @@ if [[ "${RELEASE_HOST_DISCOVERY_METHOD}" == "gce_metadata" ]]; then export GCP_INSTANCE_NAME=$(curl "http://metadata.google.internal/computeMetadata/v1/instance/name" -H "Metadata-Flavor: Google" -s) export GCP_INSTANCE_ZONE=$(curl "http://metadata.google.internal/computeMetadata/v1/instance/zone" -H "Metadata-Flavor: Google" -s | sed 's:.*/::') RELEASE_HOSTNAME="$GCP_INSTANCE_NAME.$GCP_INSTANCE_ZONE.c.${GCP_PROJECT_ID}.internal" +elif [[ "${RELEASE_HOST_DISCOVERY_METHOD}" == "aws_ecs_metadata" ]]; then + RELEASE_HOSTNAME=$(curl "${ECS_CONTAINER_METADATA_URI_V4}" | jq -r '.Networks[0].IPv4Addresses[0]') else RELEASE_HOSTNAME=${RELEASE_HOSTNAME:-127.0.0.1} fi