[121] Update env variable names

dev/README.md

@@ -39,9 +39,9 @@ GOOGLE_OAUTH_CLIENT_ID=<oauth client id to enable OAuth>
 GOOGLE_OAUTH_CLIENT_SECRET=<oauth client secret>
 MAPBOX_TOKEN=<Mapbox API token>
 MAPBOX_GEOCODE_RATE_LIMIT_PER_MIN=<Mapbox API rate limit, default = 600>
-REACT_APP_PUBLIC_MAPBOX_TOKEN=<Different Mapbox API token>
-REACT_APP_POLICY_PUBLIC_ID=<Public id for Iubenda service that provides legal policies>
-REACT_APP_COOKIE_CONSENT_PUBLIC_ID=<Public ID for Iubenda service that provides cookie consent banner>
+VITE_APP_PUBLIC_MAPBOX_TOKEN=<Different Mapbox API token>
+VITE_APP_POLICY_PUBLIC_ID=<Public id for Iubenda service that provides legal policies>
+VITE_APP_COOKIE_CONSENT_PUBLIC_ID=<Public ID for Iubenda service that provides cookie consent banner>
 LOCALSTACK_API_KEY=<Localstack (mock AWS) API key>
 ```
 

dev/docker-compose.dev.full.test.yml

@@ -41,11 +41,11 @@ services:
       # We can't use curator:3001 here because that's an internal DNS,
       # not accessible from the user's browser.
       # In production simply /auth/google would work.
-      REACT_APP_LOGIN_URL: "http://localhost:3001/auth/google"
-      REACT_APP_PUBLIC_MAPBOX_TOKEN: "${REACT_APP_PUBLIC_MAPBOX_TOKEN}"
-      REACT_APP_POLICY_PUBLIC_ID: "${REACT_APP_POLICY_PUBLIC_ID}"
-      REACT_APP_COOKIE_CONSENT_PUBLIC_ID: "${REACT_APP_COOKIE_CONSENT_PUBLIC_ID}"
-      REACT_APP_DATA_DICTIONARY_LINK: "${REACT_APP_DATA_DICTIONARY_LINK}"
+      VITE_APP_LOGIN_URL: "http://localhost:3001/auth/google"
+      VITE_APP_PUBLIC_MAPBOX_TOKEN: "${VITE_APP_PUBLIC_MAPBOX_TOKEN}"
+      VITE_APP_POLICY_PUBLIC_ID: "${VITE_APP_POLICY_PUBLIC_ID}"
+      VITE_APP_COOKIE_CONSENT_PUBLIC_ID: "${VITE_APP_COOKIE_CONSENT_PUBLIC_ID}"
+      VITE_APP_DATA_DICTIONARY_LINK: "${VITE_APP_DATA_DICTIONARY_LINK}"
       ENABLE_LOCAL_AUTH: "true"
   localstack:
     image: localstack/localstack-pro

dev/docker-compose.dev.full.yml

@@ -46,10 +46,10 @@ services:
       # We can't use curator:3001 here because that's an internal DNS,
       # not accessible from the user's browser.
       # In production simply /auth/google would work.
-      REACT_APP_LOGIN_URL: "http://localhost:3001/auth/google"
-      REACT_APP_PUBLIC_MAPBOX_TOKEN: "${REACT_APP_PUBLIC_MAPBOX_TOKEN}"
-      REACT_APP_POLICY_PUBLIC_ID: "${REACT_APP_POLICY_PUBLIC_ID}"
-      REACT_APP_COOKIE_CONSENT_PUBLIC_ID: "${REACT_APP_COOKIE_CONSENT_PUBLIC_ID}"
+      VITE_APP_LOGIN_URL: "http://localhost:3001/auth/google"
+      VITE_APP_PUBLIC_MAPBOX_TOKEN: "${VITE_APP_PUBLIC_MAPBOX_TOKEN}"
+      VITE_APP_POLICY_PUBLIC_ID: "${VITE_APP_POLICY_PUBLIC_ID}"
+      VITE_APP_COOKIE_CONSENT_PUBLIC_ID: "${VITE_APP_COOKIE_CONSENT_PUBLIC_ID}"
       VITE_APP_RECAPTCHA_SITE_KEY: "${VITE_APP_RECAPTCHA_SITE_KEY}"
       VITE_APP_DATA_DICTIONARY_LINK: "${VITE_APP_DATA_DICTIONARY_LINK}"
       ENABLE_LOCAL_AUTH: "true"

dev/docker-compose.dev.yml

@@ -31,9 +31,9 @@ services:
       # not accessible from the user's browser.
       # In production simply /auth/google would work.
       VITE_APP_LOGIN_URL: "http://localhost:3001/auth/google"
-      VITE_APP_PUBLIC_MAPBOX_TOKEN: "${REACT_APP_PUBLIC_MAPBOX_TOKEN}"
-      VITE_APP_POLICY_PUBLIC_ID: "${REACT_APP_POLICY_PUBLIC_ID}"
-      VITE_APP_COOKIE_CONSENT_PUBLIC_ID: "${REACT_APP_COOKIE_CONSENT_PUBLIC_ID}"
+      VITE_APP_PUBLIC_MAPBOX_TOKEN: "${VITE_APP_PUBLIC_MAPBOX_TOKEN}"
+      VITE_APP_POLICY_PUBLIC_ID: "${VITE_APP_POLICY_PUBLIC_ID}"
+      VITE_APP_COOKIE_CONSENT_PUBLIC_ID: "${VITE_APP_COOKIE_CONSENT_PUBLIC_ID}"
       VITE_APP_RECAPTCHA_SITE_KEY: "${VITE_APP_RECAPTCHA_SITE_KEY}"
-      VITE_APP_DISEASE_NAME: "${REACT_APP_DISEASE_NAME}"
+      VITE_APP_DISEASE_NAME: "${VITE_APP_DISEASE_NAME}"
       VITE_APP_DATA_DICTIONARY_LINK: "${VITE_APP_DATA_DICTIONARY_LINK}"

verification/curator-service/Dockerfile

@@ -32,16 +32,16 @@ RUN npm ci
 # Bundle app source
 COPY verification/curator-service/ui/. .
 # Build the app.
-ENV REACT_APP_LOGIN_URL /auth/google
+ENV VITE_APP_LOGIN_URL /auth/google
 # Set the public (but restricted to our domains) mapbox token.
 # A more flexible solution to be able to run that image on other domains would
 # be for the curator service to expose the tokens via an API but this is much
 # simpler for now and again, this is public so fine to be checked-in an image.
-ENV REACT_APP_PUBLIC_MAPBOX_TOKEN "pk.eyJ1IjoiaGVhbHRobWFwIiwiYSI6ImNrYzNjczdmczA3cTQyc3M1bHdndHVjZWsifQ.0qMMMDRA3p1VeBQvXKpfdQ"
+ENV VITE_APP_PUBLIC_MAPBOX_TOKEN "pk.eyJ1IjoiaGVhbHRobWFwIiwiYSI6ImNrYzNjczdmczA3cTQyc3M1bHdndHVjZWsifQ.0qMMMDRA3p1VeBQvXKpfdQ"
 # Set the Iubenda policy and cookie consent IDs. These are public so fine to be checked-in an image.
-ENV REACT_APP_POLICY_PUBLIC_ID "89575059"
-ENV REACT_APP_COOKIE_CONSENT_PUBLIC_ID "2070778"
-ENV REACT_APP_RECAPTCHA_SITE_KEY "6LdhjvwgAAAAALrxavR_zR58kxxap07D4ba8X-jE"
+ENV VITE_APP_POLICY_PUBLIC_ID "89575059"
+ENV VITE_APP_COOKIE_CONSENT_PUBLIC_ID "2070778"
+ENV VITE_APP_RECAPTCHA_SITE_KEY "6LdhjvwgAAAAALrxavR_zR58kxxap07D4ba8X-jE"
 ENV VITE_APP_DISEASE_NAME "Mpox"
 ENV VITE_APP_MAP_LINK_DEV "http://dev-map.marburg.global.health/"
 ENV VITE_APP_MAP_LINK_LOCAL "http://dev-map.marburg.global.health/"

verification/curator-service/api/Dockerfile

@@ -1,5 +1,5 @@
 # Dev docker file for curator service.
-FROM node:16.18.0
+FROM node:18.18.0
 
 # set the version (this should be set from outside)
 ARG CURATOR_VERSION