From 5b1dbec9b064e855e8130231fcc0baabd1533dfe Mon Sep 17 00:00:00 2001 From: David Muto Date: Fri, 12 Jan 2018 14:52:09 -0500 Subject: [PATCH] feature(docker-image): allow custom nginx port within container (#4086) * Use PORT to override nginx listen port when defined * Add dockerignore to make build context smaller --- .dockerignore | 7 +++++++ Dockerfile | 2 +- docker-run.sh | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..5f862d88 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ +/.git +/.github +/dev-helpers +/docs +/src +/swagger-ui-dist-package +/test diff --git a/Dockerfile b/Dockerfile index fd831f04..66a6ebef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV OAUTH_REALM "**None**" ENV OAUTH_APP_NAME "**None**" ENV OAUTH_ADDITIONAL_PARAMS "**None**" ENV SWAGGER_JSON "/app/swagger.json" -ENV PORT 80 +ENV PORT 8080 ENV BASE_URL "" RUN apk add --update nginx diff --git a/docker-run.sh b/docker-run.sh index 784c66a2..6ed3000a 100644 --- a/docker-run.sh +++ b/docker-run.sh @@ -53,4 +53,7 @@ if [[ -n "$VALIDATOR_URL" ]]; then unset TMP_VU fi +# replace the PORT that nginx listens on if supplied +if [[ -n "${PORT}" ]]; then sed -i "s|8080|${PORT}|g" /etc/nginx/nginx.conf; fi + exec nginx -g 'daemon off;'