Merge branch 'v1.1.0' into bugfix/605-solr-port

.github/workflows/frontend.yml

@@ -44,7 +44,14 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Run Tests
+        env:
+          RELEASE: dev
+          ENV_FILE: .envs/.react
+          HTML_PATH: public/
         run: |
+          # Replaces react-scripts substitution during build for index.html and generates runtime_env.js
+          docker/production/react/entrypoint
+
           yarn test:coverage
 
       - name: Upload Coverage Report

backend/config/settings/base.py

@@ -334,11 +334,11 @@
 # django-cors-headers
 # -------------------------------------------------------------------------------
 # https://github.com/adamchainz/django-cors-headers#setup
-CORS_ALLOWED_ORIGINS = [
-    "http://localhost:3000",
-]
+CORS_ALLOWED_ORIGINS = env.list(
+    "CORS_ALLOWED_ORIGINS", default=["http://localhost:5000"]
+)
 CORS_ALLOW_CREDENTIALS = True
-CORS_ORIGIN_WHITELIST = env.list("CORS_ORIGIN_WHITELIST")
+CORS_ORIGIN_WHITELIST = env.list("CORS_ORIGIN_WHITELIST", default=[])
 
 SEARCH_URL = env("REACT_APP_SEARCH_URL")
 WGET_URL = env("REACT_APP_WGET_API_URL")

frontend/Makefile

@@ -2,10 +2,14 @@
 build:
 	docker build $(ARGS) -t react:latest -f docker/production/react/Dockerfile .
 
+.PHONY: build-local
+build-local:
+	docker build $(ARGS) -t react:latest -f docker/local/Dockerfile .
+
 .PHONY: run
 run:
 	docker run $(ARGS) -it --rm -p 3000:3000 react:latest
 
-.PHONY: run-shell
-run-shell:
-	docker run $(ARGS) -it --rm --entrypoint /bin/sh react:latest
+.PHONY: shell
+shell:
+	docker run $(ARGS) -it --rm -p 3000:3000 --entrypoint /bin/sh react:latest

frontend/docker-compose.yml

@@ -7,6 +7,11 @@ services:
       dockerfile: ./docker/local/Dockerfile
     image: metagrid_local_react
     container_name: react
+    environment:
+      - DEBUG=true
+      - RELEASE=dev
+      - HTML_PATH=/app/public
+      - ENV_FILE=/app/.envs/.react
     env_file:
       - .envs/.react
     volumes:

frontend/docker/local/Dockerfile

@@ -15,5 +15,16 @@ RUN yarn install
 # Add app
 COPY . ./
 
+# Determines which conf to use if app is/is not being served through subdirectory
+COPY ./docker/production/react/entrypoint /entrypoint
+# gettext-base is required for envsubst
+RUN sed -i 's/\r$//g' /entrypoint && \
+  chmod +x /entrypoint && \
+  apt-get update && \
+  apt-get install -y gettext-base && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
+ENTRYPOINT ["/entrypoint"]
+
 # Start app
 CMD ["yarn", "start:local"]

frontend/docker/production/react/entrypoint

@@ -1,44 +1,66 @@
 #!/bin/sh
 
-[[ -n "${DEBUG}" ]] && set -x
+[ -n "${DEBUG}" ] && set -x
 
-runtime_path="/usr/share/nginx/html/static/js/runtime_env.js"
+export RELEASE="${RELEASE:-production}"
+export ENV_FILE="${ENV_FILE:-/env}"
+export HTML_PATH="${HTML_PATH:-/usr/share/nginx/html}"
+export STATIC_PATH=""
+export STATIC_URL="${PUBLIC_URL}${STATIC_PATH}"
+export RUNTIME_PATH="${HTML_PATH}${STATIC_PATH}/runtime_env.js"
 
-rm -rf "${runtime_path}" && touch "${runtime_path}"
+TMP_PATH=/tmp
 
-echo "window.ENV = {" >> "${runtime_path}"
+if [ ! -e "$(dirname ${RUNTIME_PATH})" ]
+then
+    mkdir -p "$(dirname ${RUNTIME_PATH})"
+fi
 
-while read -r line; do
-    [[ -z "${line}" || "${line}" =~ ^# ]] && continue
+if [ "${RELEASE}" = "production" ]
+then
+    export STATIC_PATH="/static/js"
+fi
 
-    varname=$(printf '%s\n' "${line}" | cut -d"=" -f1)
-    varvalue=$(printenv "${varname}")
+if [ -e "${ENV_FILE}" ]; then
+    echo "window.ENV = {" > "${RUNTIME_PATH}"
 
-    if [[ -z "${varvalue}" ]]; then
-        varvalue=$(printf '%s\n' "${line}" | cut -d"=" -f2)
+    while read -r line; do
+        [ -z "$(echo ${line} | grep -vE '^# |^$')" ] && continue
 
-        export "${varname}"="${varvalue}"
-    fi
+        varname=$(printf '%s\n' "${line}" | cut -d"=" -f1)
+        varvalue=$(printenv "${varname}")
 
-    echo "  ${varname}: \"${varvalue}\"," >> "${runtime_path}"
-done < ${ENV_FILE:-/env}
+        if [ -z "${varvalue}" ]; then
+            varvalue=$(printf '%s\n' "${line}" | cut -d"=" -f2)
 
-echo "};" >> "${runtime_path}"
+            export "${varname}"="${varvalue}"
+        fi
 
-if [[ -z "${PUBLIC_URL}" ]]
-then
-    envsubst '${PREVIOUS_URL}' < /nginx.conf > /etc/nginx/conf.d/default.conf
-    export PUBLIC_URL=""
-else
-    envsubst '${PREVIOUS_URL},${PUBLIC_URL}' < /nginx.subdir.conf > /etc/nginx/conf.d/default.conf
+        echo "  ${varname}: \"${varvalue}\"," >> "${RUNTIME_PATH}"
+    done < ${ENV_FILE}
+
+    echo "};" >> "${RUNTIME_PATH}"
 fi
 
-# prepend any "/static/... with "${PUBLIC_URL}/static/...
-sed -i"" "s/\"\/static/\"\${PUBLIC_URL}\/static/g" /usr/share/nginx/html/index.html
+if [ ! -e "/index.html" ]; then
+    cp "${HTML_PATH}/index.html" "${TMP_PATH}/index.html"
+fi
+
+if [ "${RELEASE}" = "production" ]
+then
+    if [ -z "${PUBLIC_URL}" ]
+    then
+        envsubst '${PREVIOUS_URL}' < /nginx.conf > /etc/nginx/conf.d/default.conf
+        export PUBLIC_URL=""
+    else
+        envsubst '${PREVIOUS_URL},${PUBLIC_URL}' < /nginx.subdir.conf > /etc/nginx/conf.d/default.conf
 
-# move original index.html, envsubst cannot modify in place
-mv /usr/share/nginx/html/index.html /index.html
+        # Fixes react-scripts static path e.g. /static/ -> $PUBLIC_URL/static/
+        sed -i"" "s/\"\/static\//\"\$PUBLIC_URL\/static\//g" "${TMP_PATH}/index.html"
+    fi
+
+fi
 
-envsubst '${PUBLIC_URL},${$REACT_APP_GOOGLE_ANALYTICS_TRACKING_ID}' < /index.html > /usr/share/nginx/html/index.html
+envsubst '$STATIC_URL,$PUBLIC_URL,$REACT_APP_GOOGLE_ANALYTICS_TRACKING_ID' < "${TMP_PATH}/index.html" > "${HTML_PATH}/index.html"
 
 exec "$@"

frontend/public/index.html

@@ -27,7 +27,7 @@
     -->
     <title>ESGF MetaGrid</title>
 
-    <script type="application/javascript" src="$PUBLIC_URL/static/js/runtime_env.js"></script>
+    <script type="application/javascript" src="$STATIC_URL/runtime_env.js"></script>
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=$REACT_APP_GOOGLE_ANALYTICS_TRACKING_ID"></script>
     <script>