Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Map config updates

Rich Turner1fded2ccb061
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 8ead20d3a..66fab32f7 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -64,8 +64,8 @@ ENV APP_DOCROOT /deployment/manager/app
ENV UI_DOCROOT /deployment/manager/ui
ENV SHARED_DOCROOT /deployment/manager/shared
ENV LOGGING_CONFIG_FILE /deployment/manager/logging.properties
-ENV MAP_TILES_PATH /deployment/manager/map/mapdata.mbtiles
-ENV MAP_SETTINGS_PATH /deployment/manager/map/mapsettings.json
+ENV MAP_TILES_PATH /deployment/map/mapdata.mbtiles
+ENV MAP_SETTINGS_PATH /deployment/map/mapsettings.json
EXPOSE 8080
diff --git a/manager/rpi3.Dockerfile b/manager/rpi3.Dockerfile
index 14e9acdc1..08de119d7 100644
--- a/manager/rpi3.Dockerfile
+++ b/manager/rpi3.Dockerfile
@@ -27,8 +27,8 @@ RUN [ "cross-build-end" ]
ENV APP_DOCROOT /deployment/manager/app
ENV UI_DOCROOT /deployment/manager/ui
ENV LOGGING_CONFIG_FILE /deployment/manager/logging.properties
-ENV MAP_TILES_PATH /deployment/manager/map/mapdata.mbtiles
-ENV MAP_SETTINGS_PATH /deployment/manager/map/mapsettings.json
+ENV MAP_TILES_PATH /deployment/map/mapdata.mbtiles
+ENV MAP_SETTINGS_PATH /deployment/map/mapsettings.json
EXPOSE 8080
diff --git a/map/config.json b/map/config.json
index 9aea55fc8..013bd3b92 100644
--- a/map/config.json
+++ b/map/config.json
@@ -2,9 +2,9 @@
"options": {
"frontPage": true,
"paths": {
- "root": "/shared",
+ "root": "/deployment/manager/shared",
"fonts": "/server/fonts",
- "styles": "/data",
+ "styles": "/deployment/map",
"mbtiles": "/data"
}
},
diff --git a/platform/rpi3/pi64/openremote-run.sh b/platform/rpi3/pi64/openremote-run.sh
index 1dfe302c5..012e0d7cf 100755
--- a/platform/rpi3/pi64/openremote-run.sh
+++ b/platform/rpi3/pi64/openremote-run.sh
@@ -48,7 +48,7 @@ export APP_DOCROOT=${BASE_PATH}/server/deployment/manager/app
export UI_DOCROOT=${BASE_PATH}/server/deployment/manager/ui
export SHARED_DOCROOT=${BASE_PATH}/server/deployment/manager/shared
export LOGGING_CONFIG_FILE=${BASE_PATH}/server/deployment/manager/logging.properties
-export MAP_TILES_PATH=${BASE_PATH}/server/deployment/manager/map/mapdata.mbtiles
-export MAP_SETTINGS_PATH=${BASE_PATH}/server/deployment/manager/map/mapsettings.json
+export MAP_TILES_PATH=${BASE_PATH}/server/deployment/map/mapdata.mbtiles
+export MAP_SETTINGS_PATH=${BASE_PATH}/server/deployment/map/mapsettings.json
java -cp "${BASE_PATH}/server/lib/*" org.openremote.manager.Main
diff --git a/profile/dev-map.yml b/profile/dev-map.yml
index ce098f801..ae52afbe5 100644
--- a/profile/dev-map.yml
+++ b/profile/dev-map.yml
@@ -13,6 +13,5 @@ services:
ports:
- "127.0.0.1:8082:80"
volumes:
- - ../deployment/manager/shared:/shared
+ - ../deployment:/deployment
- ../deployment/map:/data
- command: ["-c", "/server/config.json"]