diff --git a/README.md b/README.md index 6c9c197f7..690a47350 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Copyright © 2021-2025 Geospatial Research Institute Toi Hangarau # Flood Resilience Digital Twin (FReDT) -![image](https://github.com/GeospatialResearch/Digital-Twins/assets/41398636/b7b9da6c-3895-46f5-99dc-4094003b2946) +![image](paper/Capture2024.PNG) ## Introduction diff --git a/build_docker.sh b/build_docker.sh index a3ee5687e..36a0c6509 100644 --- a/build_docker.sh +++ b/build_docker.sh @@ -30,15 +30,15 @@ docker compose build echo "Saving images to fredt.tar" docker save -o fredt.tar \ postgis/postgis:16-3.4 \ - lparkinson/backend-flood-resilience-dt:1.2 \ - lparkinson/celery-flood-resilience-dt:1.2 \ - lparkinson/geoserver-flood-resilience-dt:1.2 \ - redis:7 \ + lparkinson/flood-resilience-dt:2.0 \ + lparkinson/terria-dt:2.0 \ + lparkinson/geoserver-dt:2.0 \ + redis:7 echo "Saving docker build dependency images to build_dep.tar" docker save -o build_dep.tar \ lparkinson/bg_flood:v0.9 \ continuumio/miniconda3:23.10.0-1 \ - docker.osgeo.org/geoserver:2.21.2 \ - nginx:stable + docker.osgeo.org/geoserver:2.28.x \ + ghcr.io/terriajs/terriamap:0.4.1 diff --git a/docker-compose.yml b/docker-compose.yml index 202b1ba47..da075219a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: build: context: . dockerfile: geoserver.Dockerfile - image: lparkinson/geoserver-dt:1.2 + image: lparkinson/geoserver-dt:2.0 container_name: geoserver_digital_twin volumes: - geoserver_data:/opt/geoserver_data @@ -122,6 +122,7 @@ services: # Front-end using terria.js build: context: terriajs + image: lparkinson/terria-dt:2.0 ports: - "${WWW_PORT}:3001" environment: diff --git a/paper/Capture2024.PNG b/paper/Capture2024.PNG index a6b4cc959..f19beed9e 100644 Binary files a/paper/Capture2024.PNG and b/paper/Capture2024.PNG differ