Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions common/docker-entrypoint.d/00-check-for-required-env.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/bash
#
# Copyright 2020 F5 Networks
#
Expand Down Expand Up @@ -44,7 +44,7 @@ elif [[ -v AWS_SESSION_TOKEN ]]; then
# b) Using Instance Metadata Service (IMDS) credentials, if IMDS is present at http://169.254.169.254.
# See https://docs.aws.amazon.com/sdkref/latest/guide/feature-imds-credentials.html.
# Example: We are running inside an EC2 instance.
elif TOKEN=`curl -X PUT --silent --fail --connect-timeout 2 --max-time 2 "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600"` && curl -H "X-aws-ec2-metadata-token: $TOKEN" --output /dev/null --silent --head --fail --connect-timeout 2 --max-time 5 "http://169.254.169.254"; then
elif TOKEN=`curl -X PUT --silent --fail --connect-timeout 2 --max-time 2 "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600"` && curl -H "X-aws-ec2-metadata-token: $TOKEN" --output /dev/null --silent --head --fail --connect-timeout 2 --max-time 5 "http://169.254.169.254"; then
echo "Running inside an EC2 instance, using IMDS for credentials"

# c) Using assume role credentials. This is indicated by AWS_WEB_IDENTITY_TOKEN_FILE being set.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/bash

#
# Copyright 2022 F5 Networks
#
Expand Down
4 changes: 2 additions & 2 deletions common/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/bash
#
# Copyright 2020 F5 Networks
#
Expand Down Expand Up @@ -71,7 +71,7 @@ fi
# See documentation for this feature. We do not parse this as a boolean
# since "true" and "false" are the required values of the header this populates
if [ "${CORS_ALLOW_PRIVATE_NETWORK_ACCESS}" != "true" ] && [ "${CORS_ALLOW_PRIVATE_NETWORK_ACCESS}" != "false" ]; then
export CORS_ALLOW_PRIVATE_NETWORK_ACCESS=""
export CORS_ALLOW_PRIVATE_NETWORK_ACCESS=""
fi

# This is the primary logic to determine the s3 host used for the
Expand Down
Loading