hack

Use a catchall for single page apps. (#763 )
This creates a new environment variable, CERC_SINGLE_PAGE_APP, which controls whether a catchall redirection back to / is applied. If the value is not explicitly set, we try to detect if the page looks like a single-page app. Reviewed-on: #763 Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com> Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>
2024-02-23 17:07:49 -05:00 · 2024-02-23 20:32:24 +00:00 · 2024-02-23 13:15:37 -07:00
3 changed files with 22 additions and 3 deletions
@@ -187,7 +187,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args, publish_imag
            result = process_container(build_context)
            if result:
                if publish_images:
-                    publish_image(container, image_registry)
+                    publish_image(f"{container}:local", image_registry)
            else:
                print(f"Error running build for {build_context.container}")
                if not opts.o.continue_on_error:
@@ -16,6 +16,10 @@ if [ -z "$CERC_BUILD_TOOL" ]; then
  fi
 fi

+echo "for building the mars v2 frontend"
+npm install --save dotenv
+yarn install-charting-library
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 WORK_DIR="${1:-/app}"

@@ -3,13 +3,28 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
    set -x
 fi

+CERC_LISTEN_PORT=${CERC_LISTEN_PORT:-80}
 CERC_WEBAPP_FILES_DIR="${CERC_WEBAPP_FILES_DIR:-/data}"
 CERC_ENABLE_CORS="${CERC_ENABLE_CORS:-false}"
+CERC_SINGLE_PAGE_APP="${CERC_SINGLE_PAGE_APP}"
+
+if [ -z "${CERC_SINGLE_PAGE_APP}" ]; then
+  if [ 1 -eq $(find "${CERC_WEBAPP_FILES_DIR}" -name '*.html' | wc -l) ] && [ -d "${CERC_WEBAPP_FILES_DIR}/static" ]; then
+    CERC_SINGLE_PAGE_APP=true
+  else
+    CERC_SINGLE_PAGE_APP=false
+  fi
+fi

 if [ "true" == "$CERC_ENABLE_CORS" ]; then
  CERC_HTTP_EXTRA_ARGS="$CERC_HTTP_EXTRA_ARGS --cors"
 fi

+if [ "true" == "$CERC_SINGLE_PAGE_APP" ]; then
+  # Create a catchall redirect back to /
+  CERC_HTTP_EXTRA_ARGS="$CERC_HTTP_EXTRA_ARGS --proxy http://localhost:${CERC_LISTEN_PORT}?"
+fi
+
 LACONIC_HOSTED_CONFIG_FILE=${LACONIC_HOSTED_CONFIG_FILE}
 if [ -z "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
  if [ -f "/config/laconic-hosted-config.yml" ]; then
@@ -20,8 +35,8 @@ if [ -z "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
 fi

 if [ -f "${LACONIC_HOSTED_CONFIG_FILE}" ]; then
-  /scripts/apply-webapp-config.sh $LACONIC_HOSTED_CONFIG_FILE ${CERC_WEBAPP_FILES_DIR}
+  /scripts/apply-webapp-config.sh $LACONIC_HOSTED_CONFIG_FILE "${CERC_WEBAPP_FILES_DIR}"
 fi

 /scripts/apply-runtime-env.sh ${CERC_WEBAPP_FILES_DIR}
-http-server $CERC_HTTP_EXTRA_ARGS -p ${CERC_LISTEN_PORT:-80} ${CERC_WEBAPP_FILES_DIR}
+http-server $CERC_HTTP_EXTRA_ARGS -p ${CERC_LISTEN_PORT} "${CERC_WEBAPP_FILES_DIR}"
Author	SHA1	Message	Date
zramsay	817f0082e8	hack Lint Checks / Run linter (pull_request) Successful in 44s Details Deploy Test / Run deploy test suite (pull_request) Successful in 3m39s Details Webapp Test / Run webapp test suite (pull_request) Successful in 2m55s Details Smoke Test / Run basic test suite (pull_request) Successful in 3m6s Details K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 10m8s Details	2024-02-23 17:07:49 -05:00
telackey	704c42c404	Use a catchall for single page apps. (#763 ) Lint Checks / Run linter (push) Successful in 27s Details Publish / Build and publish (push) Successful in 56s Details Webapp Test / Run webapp test suite (push) Successful in 2m50s Details Deploy Test / Run deploy test suite (push) Successful in 4m1s Details Smoke Test / Run basic test suite (push) Successful in 6m18s Details This creates a new environment variable, CERC_SINGLE_PAGE_APP, which controls whether a catchall redirection back to / is applied. If the value is not explicitly set, we try to detect if the page looks like a single-page app. Reviewed-on: #763 Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com> Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>	2024-02-23 20:32:24 +00:00
dboreham	202f187172	Fix copy/paste error Lint Checks / Run linter (push) Successful in 24s Details Publish / Build and publish (push) Successful in 1m15s Details Webapp Test / Run webapp test suite (push) Successful in 3m9s Details Deploy Test / Run deploy test suite (push) Successful in 4m12s Details Smoke Test / Run basic test suite (push) Successful in 5m15s Details	2024-02-23 13:15:37 -07:00