Merge branch 'docker'

Dockerfile

@@ -8,16 +8,11 @@ RUN yarn build
 
 
 #
-FROM nginx:1.21
+FROM nginx:1.22.0
 
 RUN apt-get update && apt-get install -y jq
 
 WORKDIR /app
 COPY --from=build /app/dist dist
-COPY --from=build /app/dist/public_path_placeholder/monacoeditorwork dist/monacoeditorwork
-COPY docker/entrypoint.sh .
 COPY docker/docker-entrypoint.d/* /docker-entrypoint.d/
 COPY docker/nginx-default.conf.template /etc/nginx/templates/default.conf.template
-
-ENTRYPOINT ["./entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]

docker/docker-entrypoint.d/97-copy-to-public-path.sh → docker/docker-entrypoint.d/91-copy-to-public-path.sh

@@ -1,14 +1,7 @@
 #!/bin/bash
 # Copy the Vue files to the Vue publicPath
 
-PUBLIC_PATH=${PUBLIC_PATH:?"undefined"}
-
-DIST_DIR="/app/dist"
-SITE_DIR_ROOT="/app/site"
-
-SITE_DIR=$(echo $SITE_DIR_ROOT/$PUBLIC_PATH | tr -s /)
-SITE_DIR=${SITE_DIR%/} # e.g., /app/site/vue
-
+source $(dirname -- "$0")/envvar.sh;
 
 if [[ ! -d ${DIST_DIR} ]]
 then

docker/docker-entrypoint.d/98-replace_env_var_place_holders.sh → docker/docker-entrypoint.d/92-replace_env_var_place_holders.sh

@@ -1,16 +1,7 @@
 #!/bin/bash
 # Replace place holders with env vars in Vue files
 
-PUBLIC_PATH=${PUBLIC_PATH:?"undefined"}
-
-SITE_DIR_ROOT="/app/site"
-
-SITE_DIR=$(echo $SITE_DIR_ROOT/$PUBLIC_PATH | tr -s /)
-SITE_DIR=${SITE_DIR%/} # e.g., /app/site/vue
-
-PUBLIC_PATH_PLACEHOLDER="/public_path_placeholder/"
-
-PUBLIC_PATH="${PUBLIC_PATH%/}/"
+source $(dirname -- "$0")/envvar.sh;
 
 if [[ ! -d ${SITE_DIR} ]]; then
     echo "Error: ${SITE_DIR} doesn't exit!"

docker/docker-entrypoint.d/99-update-config.sh → docker/docker-entrypoint.d/93-update-config.sh

@@ -1,16 +1,10 @@
 #!/bin/bash
 # Update config.json
 
-PUBLIC_PATH=${PUBLIC_PATH:?"undefined"}
-API_NAME=${API_NAME:?"undefined"}
-API_HTTP=${API_HTTP:?"undefined"}
+source $(dirname -- "$0")/envvar.sh;
 
-SITE_DIR_ROOT="/app/site"
 CONFIG_JSON="config.json"
 
-SITE_DIR=$(echo $SITE_DIR_ROOT/$PUBLIC_PATH | tr -s /)
-SITE_DIR=${SITE_DIR%/} # e.g., /app/site/vue
-
 if [[ ! -d ${SITE_DIR} ]]; then
     echo "Error: ${SITE_DIR} doesn't exit!"
     exit 1

docker/docker-entrypoint.d/94-move-monaco-editor-workers.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copy the Vue files to the Vue publicPath
+
+set -e
+
+source $(dirname -- "$0")/envvar.sh;
+
+FILE=$(basename $0)
+
+BASE_NAME=monacoeditorwork
+
+SOURCE=$(echo ${SITE_DIR}/${PUBLIC_PATH_PLACEHOLDER}/${BASE_NAME} | tr -s /)
+DEST=$(echo ${SITE_DIR}/${BASE_NAME} | tr -s /)
+
+if [[ ! -d ${SOURCE} ]]
+then
+    echo "$FILE: the source dir doesn't exist: $SOURCE"
+    exit 0
+fi
+
+if [[ $SOURCE == $DEST ]]
+then
+    echo "$FILE: the source and destination are the same: $SOURCE"
+    exit 0
+fi
+
+command="rm -rf $DEST"
+echo + $command
+eval $command
+
+command="mv $SOURCE $DEST"
+echo + $command
+eval $command

docker/docker-entrypoint.d/envvar.sh

@@ -0,0 +1,20 @@
+#!/bin/echo to be sourced
+# This file is source by other files in this directory. 
+
+PUBLIC_PATH="${PUBLIC_PATH:-/}"
+API_HTTP="${API_HTTP:-http://localhost:8000}"
+API_NAME="${API_NAME:-localhost}"
+
+PUBLIC_PATH="${PUBLIC_PATH%/}/" # ensure trailing slash
+
+echo + "PUBLIC_PATH=${PUBLIC_PATH}"
+echo + "API_HTTP=${API_HTTP}"
+echo + "API_NAME=${API_NAME}"
+
+DIST_DIR="/app/dist"
+SITE_DIR_ROOT="/app/site"
+
+SITE_DIR=$(echo $SITE_DIR_ROOT/$PUBLIC_PATH | tr -s /)
+SITE_DIR=${SITE_DIR%/} # e.g., /app/site/vue
+
+PUBLIC_PATH_PLACEHOLDER="/public_path_placeholder/"