Merge pull request #3482 from alphagov/fix-docker-host-181498273

Fix letter functional tests to work in Docker
This commit is contained in:
Ben Thorner
2022-03-15 12:32:54 +00:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -432,7 +432,7 @@ class Development(Config):
ANTIVIRUS_ENABLED = os.getenv('ANTIVIRUS_ENABLED') == '1' ANTIVIRUS_ENABLED = os.getenv('ANTIVIRUS_ENABLED') == '1'
API_HOST_NAME = "http://localhost:6011" API_HOST_NAME = os.getenv('API_HOST_NAME', 'http://localhost:6011')
API_RATE_LIMIT_ENABLED = True API_RATE_LIMIT_ENABLED = True
DVLA_EMAIL_ADDRESSES = ['success@simulator.amazonses.com'] DVLA_EMAIL_ADDRESSES = ['success@simulator.amazonses.com']

View File

@@ -8,8 +8,9 @@ source environment.sh
# this script should be run from within your virtualenv so you can access the aws cli # this script should be run from within your virtualenv so you can access the aws cli
AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-"$(aws configure get aws_access_key_id)"} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-"$(aws configure get aws_access_key_id)"}
AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-"$(aws configure get aws_secret_access_key)"} AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-"$(aws configure get aws_secret_access_key)"}
: "${SQLALCHEMY_DATABASE_URI:=postgresql://postgres@host.docker.internal/notification_api}" SQLALCHEMY_DATABASE_URI="postgresql://postgres@host.docker.internal/notification_api"
REDIS_URL="redis://host.docker.internal:6379" REDIS_URL="redis://host.docker.internal:6379"
API_HOST_NAME="http://host.docker.internal:6011"
docker run -it --rm \ docker run -it --rm \
-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \ -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
@@ -17,6 +18,7 @@ docker run -it --rm \
-e SQLALCHEMY_DATABASE_URI=$SQLALCHEMY_DATABASE_URI \ -e SQLALCHEMY_DATABASE_URI=$SQLALCHEMY_DATABASE_URI \
-e REDIS_ENABLED=${REDIS_ENABLED:-0} \ -e REDIS_ENABLED=${REDIS_ENABLED:-0} \
-e REDIS_URL=$REDIS_URL \ -e REDIS_URL=$REDIS_URL \
-e API_HOST_NAME=$API_HOST_NAME \
-v $(pwd):/home/vcap/app \ -v $(pwd):/home/vcap/app \
${DOCKER_IMAGE_NAME} \ ${DOCKER_IMAGE_NAME} \
${@} ${@}