Merge pull request #111 from geoCML/resolve-recs-todo

Dynamically set DRGON_HOST with .env var

Author: TristanDamron

.env.example

@@ -1,6 +1,6 @@
-export GEOCML_POSTGRES_PASSWORD=XXXXXXX
-export GEOCML_POSTGRES_ADMIN_PASSWORD=XXXXXXX
-export GEOCML_DESKTOP_PASSWORD=XXXXXXX
-export DRGON_HOST=XXXXXXX  # Optional; only required if you are registering your deployment publicly on a DRGON instance
-export DRGON_API_KEY=XXXXXXX  # Optional; only required if you are registering your deployment publicly on a DRGON instance
-export GEOCML_DEPLOYMENT_HOST=XXXXXXX  # Optional; only required if you are hosting your deployment publicly
+GEOCML_POSTGRES_PASSWORD=XXXXXXX
+GEOCML_POSTGRES_ADMIN_PASSWORD=XXXXXXX
+GEOCML_DESKTOP_PASSWORD=XXXXXXX
+DRGON_HOST=XXXXXXX  # Optional; only required if you are registering your deployment publicly on a DRGON instance
+DRGON_API_KEY=XXXXXXX  # Optional; only required if you are registering your deployment publicly on a DRGON instance
+GEOCML_DEPLOYMENT_HOST=XXXXXXX  # Optional; only required if you are hosting your deployment publicly

Dockerfiles/Dockerfile.geocml-server

@@ -1,6 +1,7 @@
 FROM ubuntu:22.04
-
 USER root
+
+ARG DRGON_HOST=""
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update
 
@@ -25,6 +26,9 @@ ADD ./build-resources/geocml-server/portal/ /portal/
 # Install Node dependencies
 RUN cd /portal/ && npm i
 
+# Add DRGON_HOST to NodeJS .env file
+RUN echo REACT_APP_DRGON_HOST=$DRGON_HOST >> /portal/.env
+
 # Install Ansible dependencies and run through playbook
 COPY ./ansible-playbooks/geocml-server-requirements.yaml ./ansible-playbooks/geocml-server-playbook.yaml ./
 RUN ansible-galaxy collection install ansible.posix && ansible-galaxy install -r geocml-server-requirements.yaml && ansible-playbook -i,localhost geocml-server-playbook.yaml --tags "all" && rm -f ./*.yaml

build-resources/geocml-server/portal/package-lock.json

@@ -8,16 +8,17 @@
     "@types/react-dom": "^18.3.0",
     "@types/react-redux": "^7.1.33",
     "axios": "^1.7.4",
+    "env-cmd": "^10.1.0",
     "fast-xml-parser": "^4.4.1",
     "leaflet": "^1.9.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-redux": "^9.1.2",
-    "react-scripts": "5.0.1"
+    "react-scripts": "^5.0.1"
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "env-cmd -f /portal/.env react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

build-resources/geocml-server/portal/package.json

@@ -11,7 +11,7 @@ export function collectRecommendations(dispatch, wmsInfo) {
 		}
 	}
 
-	axios.get(`http://drgon.geocml.com:8000/recommendations`, { // TODO: https://github.com/geoCML/geocml-base-deployment/issues/76
+	axios.get(`${process.env.REACT_APP_DRGON_HOST}/recommendations`, { // TODO: https://github.com/geoCML/geocml-base-deployment/issues/76
 		params: {
 			"tags": tags.join(","),
 			"limit": 10

build-resources/geocml-server/portal/src/components/Recommendations.js

@@ -8,7 +8,7 @@ if [[ $DOCKER_INSTALLED -ne 0 ]]; then
 	exit 1
 fi
 
-docker compose build --build-arg GEOCML_POSTGRES_PASSWORD --build-arg GEOCML_POSTGRES_ADMIN_PASSWORD
+docker compose build --build-arg GEOCML_POSTGRES_PASSWORD --build-arg GEOCML_POSTGRES_ADMIN_PASSWORD --build-arg DRGON_HOST
 
 echo "Done! You can start your geoCML instance by running the 'start.sh' script."
 exit 0