From f3539748d3721cd20dc1dfe0f09587465044d6c3 Mon Sep 17 00:00:00 2001 From: Wesley Schwengle Date: Tue, 9 Jun 2020 20:16:06 -0400 Subject: [PATCH] fix: Allow local ref's to be served by nginx (#5565) --- docker/nginx.conf | 1 + docker/run.sh | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docker/nginx.conf b/docker/nginx.conf index 4d19da22..fa9b6bb4 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -34,6 +34,7 @@ http { expires 1d; location ~* \.(?:json|yml|yaml)$ { + #SWAGGER_ROOT expires -1; include cors.conf; diff --git a/docker/run.sh b/docker/run.sh index e2de3053..b2c01645 100644 --- a/docker/run.sh +++ b/docker/run.sh @@ -4,6 +4,7 @@ set -e BASE_URL=${BASE_URL:-/} NGINX_ROOT=/usr/share/nginx/html INDEX_FILE=$NGINX_ROOT/index.html +NGINX_CONF=/etc/nginx/nginx.conf node /usr/share/nginx/configurator $INDEX_FILE @@ -24,7 +25,7 @@ replace_or_delete_in_index () { } if [ "${BASE_URL}" ]; then - sed -i "s|location / {|location $BASE_URL {|g" /etc/nginx/nginx.conf + sed -i "s|location / {|location $BASE_URL {|g" $NGINX_CONF fi replace_in_index myApiKeyXXXX123456789 $API_KEY @@ -37,13 +38,20 @@ fi if [[ -f "$SWAGGER_JSON" ]]; then cp -s "$SWAGGER_JSON" "$NGINX_ROOT" REL_PATH="./$(basename $SWAGGER_JSON)" + + if [[ -z "$SWAGGER_ROOT" ]]; then + SWAGGER_ROOT="$(dirname $SWAGGER_JSON)" + fi + + sed -i "s|#SWAGGER_ROOT|root $SWAGGER_ROOT;|g" $NGINX_CONF + sed -i "s|https://petstore.swagger.io/v2/swagger.json|$REL_PATH|g" $INDEX_FILE sed -i "s|http://example.com/api|$REL_PATH|g" $INDEX_FILE fi # replace the PORT that nginx listens on if PORT is supplied if [[ -n "${PORT}" ]]; then - sed -i "s|8080|${PORT}|g" /etc/nginx/nginx.conf + sed -i "s|8080|${PORT}|g" $NGINX_CONF fi find $NGINX_ROOT -type f -regex ".*\.\(html\|js\|css\)" -exec sh -c "gzip < {} > {}.gz" \;