Deperecate use of process.env, add healthcheck

.dockerignore

@@ -1,5 +1,4 @@
 .git
 .idea
-build
 
 **/*.env*

.env

@@ -1,5 +1 @@
-# PCDS config
-REACT_APP_BC_BASE_MAP_TILES_URL=https://services.pacificclimate.org/tiles/bc-albers-lite/{z}/{x}/{y}.png
-
-# YNWT config
-REACT_APP_YNWT_BASE_MAP_TILES_URL=https://services.pacificclimate.org/tiles/yukon-albers-lite/{z}/{x}/{y}.png
+PUBLIC_URL=%REPLACE_PUBLIC_URL%

.env.development

@@ -0,0 +1 @@
+PUBLIC_URL=http://localhost:30503

.env.production

@@ -1 +1 @@
-PUBLIC_URL=http://localhost:3333/
+PUBLIC_URL=%REPLACE_PUBLIC_URL%

.github/workflows/docker-publish.yml

@@ -17,6 +17,10 @@ jobs:
         run: |
           git fetch --prune --unshallow
           echo "REACT_APP_APP_VERSION=$(git describe --tags --abbrev=0) ($(git rev-parse --abbrev-ref HEAD):$(git log -1 --format=%h))" >> $GITHUB_ENV
+      - name: Build npm package
+        run: |
+          npm ci
+          npm run build
       - name: Publish to Registry
         uses: docker/build-push-action@v1
         with:

Makefile

@@ -1,15 +1,16 @@
 # These variables are set to make it convenient to run the docker image locally.
 tag = $(shell git rev-parse --abbrev-ref HEAD)
-port = 30502
+port = 30503
 public_url = http://localhost:${port}
 
 image:
-	@SDP_TAG=$(tag) SDP_PORT=$(port) SDP_PUBLIC_URL=$(public_url) docker compose -f docker/docker-compose.yaml build --build-arg REACT_APP_APP_VERSION='$(shell ./generate-commitish.sh)'
+	@npm run build
+	@SDP_TAG=$(tag) SDP_PORT=$(port) docker compose -f docker/docker-compose.yaml build --build-arg REACT_APP_APP_VERSION='$(shell ./generate-commitish.sh)'
 
 up:
-	@SDP_TAG=$(tag) SDP_PORT=$(port) SDP_PUBLIC_URL=$(public_url) docker compose -f docker/docker-compose.yaml up -d --force-recreate
-	@echo "Station Data Portal running at $(public_url)"
+	@SDP_TAG=$(tag) SDP_PORT=$(port) docker compose -f docker/docker-compose.yaml up --force-recreate
+	@echo "Station Data Portal running on $(port)"
 	@docker logs -f station-data-portal-frontend
 
 down:
-	@SDP_TAG=$(tag) SDP_PORT=$(port) SDP_PUBLIC_URL=$(public_url) docker compose -f docker/docker-compose.yaml down
+	@SDP_TAG=$(tag) SDP_PORT=$(port) docker compose -f docker/docker-compose.yaml down

craco.config.js

@@ -3,10 +3,29 @@ const { CracoAliasPlugin } = require("react-app-alias");
 const options = {}; // default is empty for most cases
 
 module.exports = {
+  eslint: null,
   plugins: [
     {
       plugin: CracoAliasPlugin,
       options: {},
     },
   ],
+  // Works around a warning that plotly.js doesn't have a source map
+  // As warnings are treated as errors in the build, this is necessary
+  // node_modules are generally external code so it is hard to fix the warning
+  // and we can safely ignore sourcemap errors.
+  webpack: {
+    configure: {
+      ignoreWarnings: [
+        function ignoreSourcemapsloaderWarnings(warning) {
+          return (
+            warning.module &&
+            warning.module.resource.includes("node_modules") &&
+            warning.details &&
+            warning.details.includes("source-map-loader")
+          );
+        },
+      ],
+    },
+  },
 };

docker/Dockerfile

@@ -1,39 +1,20 @@
-# This Dockerfile adapted from https://mherman.org/blog/dockerizing-a-react-app/
-# and Client Explorer Dockerfile.
 
-# This Dockerfile can (and should) be used to pass through automatically generated
-# version information to the build which is triggered when the image is run.
-# To do this, issue the following build command:
-#
-# docker build --build-arg REACT_APP_APP_VERSION="$(./generate-commitish.sh)" -t <tag> .
 
-# At this moment, Node.js 10.16 LTS is recommended for most users.
-#
-# In future, as we scale up, we may want to use an Alpine base image, which would reduce
-# the size of the image by about an order of magnitude and reduce the attack surface of
-# the image as well.
+FROM node:22-bookworm-slim
 
-FROM node:16
+RUN apt-get -y update &&  \ 
+    apt-get install --no-install-recommends  \
+    -y curl rpl && \
+    rm -rf /var/lib/apt/lists/*
 
-ADD . /app
-WORKDIR /app
-RUN chown node /app
-
-ENV PATH /app/node_modules/.bin:$PATH
-COPY --chown=node:node  package.json /app/package.json
-
-# Currently, we have to force install. For details, see ./docs/installation.md
-RUN npm install --quiet --force
 RUN npm install -g serve
-COPY --chown=node:node . /app
-
-EXPOSE 8080
 
-# Move the build arg REACT_APP_APP_VERSION into an
-# environment variable of the same name, for consumption
-# by the npm build process in ./entrypoint.sh
-ARG REACT_APP_APP_VERSION
-ENV REACT_APP_APP_VERSION $REACT_APP_APP_VERSION
+COPY --chown=node build /app
+COPY --chown=node docker/entrypoint.sh /app/docker/entrypoint.sh
+WORKDIR /app
 
 USER node
-ENTRYPOINT docker/entrypoint.sh
+EXPOSE 8080
+HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "curl", "-f", "http://localhost:8080/healthcheck.js" ]
+
+ENTRYPOINT ["docker/entrypoint.sh"]

docker/config.bc.js

@@ -0,0 +1,25 @@
+window.env = {
+  PUBLIC_URL: "http://localhost:30503",
+  REACT_APP_BC_BASE_MAP_TILES_URL:
+    "https://services.pacificclimate.org/tiles/bc-albers-lite/{z}/{x}/{y}.png",
+  appTitle: "BC Station Data - PCDS",
+  baseMap: "BC",
+
+  // Uses swarm based dev url by default
+  sdsUrl:
+    "https://beehive.pacificclimate.org/station-data-portal/pcds/metadata/",
+
+  // Currently deployed metadata backends do not respond to provinces QP.
+  // When they do, we can invert the commenting out below.
+  //stationsQpProvinces: BC
+  stationFilters: 'histories[0].province = "BC"',
+
+  // Always necessary for CRMP database
+  networkFilters: 'name != "PCIC Climate Variables"',
+
+  // Uses monsoon database
+  pdpDataUrl:
+    "https://beehive.pacificclimate.org/station-data-portal/pcds/data/",
+  // Uses new database
+  //pdpDataUrl: http://docker-dev02.pcic.uvic.ca:???
+};

docker/config.ynwt.js

@@ -0,0 +1,26 @@
+// Example environment config for a YNWT based deployment
+
+window.env = {
+  PUBLIC_URL: "http://localhost:30503",
+  REACT_APP_YNWT_BASE_MAP_TILES_URL:
+    "https://services.pacificclimate.org/tiles/yukon-albers-lite/{z}/{x}/{y}.png",
+  appTitle: "YNWT Station Data",
+  baseMap: "YNWT",
+
+  // sdsUrl values will be replaced by prod URLs when they become ready.
+  // For now, we have a dev instance.
+  // Uses monsoon database
+  sdsUrl:
+    "https://beehive.pacificclimate.org/station-data-portal/ynwt/metadata/",
+
+  // We do not at present need to filter based on province (verify!)
+  //stationsQpProvinces: YK,NT
+  // We do not at present need to filter networks (verify!)
+  //networkFilters: ???
+
+  // pdpDataUrl values will be replaced by prod URLs when they become ready.
+  // For now, we have a dev instance.
+  // Uses monsoon database
+  pdpDataUrl:
+    "https://beehive.pacificclimate.org/station-data-portal/ynwt/data/",
+};

docker/docker-compose.yaml

@@ -2,7 +2,6 @@
 #
 # `SDP_TAG`: Image tag
 # `SDP_PORT`: External port to map to
-# `SDP_PUBLIC_URL`: Public URL of app
 # Note: These values are set as part of the makefile, initialize the container
 # Using it.
 #
@@ -19,14 +18,7 @@ services:
       dockerfile: ./docker/Dockerfile
     #image: pcic/station-data-portal-frontend:${SDP_TAG}
     container_name: station-data-portal-frontend
-    environment:
-      - PUBLIC_URL=${SDP_PUBLIC_URL}
-    env_file:
-      - bc.env
     volumes:
-      - type: bind
-        source: ./bc-config.yaml
-        target: /app/public/config.yaml
-        read_only: true
+      - ./config.bc.js:/app/config.js
     ports:
       - "${SDP_PORT}:8080"

docker/entrypoint.sh

@@ -1,8 +1,19 @@
-# We build the app as part of the container startup so that the build process
-# can consume the runtime environment variables. (CRA apps can only access
-# environment variables at build time, not at run time.) This makes starting a
-# container a lot heavier, but we don't spin up many instances, or often,
-# so it doesn't matter.
-
-npm run build
-serve -s build -l 8080
+#!/bin/bash
+
+# Note: this pulls the public url by a combination of grep and cut and relies on 
+# PUBLIC_URL to be on its own line with the value and in the format of PUBLIC_URL="http://localhost:8080"
+# Fragile to additional quotes due to us looking for index 2
+PUBLIC_URL=$(grep PUBLIC_URL config.js | cut -d'"' -f 2)
+
+# update static files with the public url
+rpl -iR \
+    -x **/*.js \
+    -x **/*.html \
+    -x **/*.css \
+    -x **/*.json \
+    "%REPLACE_PUBLIC_URL%" $PUBLIC_URL .
+
+# It is possible that the above could be replaced by a node.js based
+# script which may prove more resillient long term 
+
+serve -s . -l 8080