From 0deabde833628c3023aee5e48a0566b40f613749 Mon Sep 17 00:00:00 2001 From: rudokemper Date: Sun, 26 May 2024 09:43:09 -0400 Subject: [PATCH 1/5] Add docker scaffolding for map-packer and mapgl-tile-renderer --- balena.yml | 10 ++++++++++ docker-compose.yml | 40 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/balena.yml b/balena.yml index b88f5b9..16bae56 100644 --- a/balena.yml +++ b/balena.yml @@ -55,6 +55,16 @@ data: - MAPBOX_ACCESS_TOKEN: "pk.eyJ1IjoibHVhbmRybyIsImEiOiJjanY2djRpdnkwOWdqM3lwZzVuaGIxa3VsIn0.jamcK2t2I1j3TXkUQFIsjQ" - USE_LOCAL_MAP_SERVER: "true" - RAILS_ENV: "offline" + # map-packer + - AZURE_STORAGE_CONNECTION_ACCOUNT_NAME: + - AZURE_STORAGE_CONNECTION_STORAGE_KEY: + - MAPBOX_ACCESS_TOKEN: + - MAPBOX_STYLE: + - MAPBOX_STYLE_NAME: + - MAP_ZOOM: + - MAP_LATITUDE: + - MAP_LONGITUDE: + - VUE_APP_PLANET_API_KEY: defaultDeviceType: "raspberrypi4-64" supportedDeviceTypes: - "raspberrypi3-64" diff --git a/docker-compose.yml b/docker-compose.yml index 7ef62d2..d10d126 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,6 +80,7 @@ services: - mbtiles:/srv/mbtiles - terrastories-import:/srv/terrastories/import - terrastories-media:/srv/terrastories/media + - offline_maps:/srv/offline_maps/ ports: - 8081:80 command: -- c @@ -100,7 +101,7 @@ services: - 21027:21027/udp restart: unless-stopped # https://hub.docker.com/_/postgres - terrastories-db: + database: image: postgres:11 ports: - 5432:5432 @@ -117,9 +118,9 @@ services: ports: - 8083:3000 depends_on: - - terrastories-db + - database environment: - DATABASE_URL: postgres://postgres:postgres@terrastories-db:5432/terrastories + DATABASE_URL: postgres://postgres:postgres@database:5432/terrastories CHOKIDAR_USEPOLLING: 'true' SECRET_KEY_BASE: "a845b372237fe58988e8fb7698b9a7b61f8cc7581dc685387ff1cb8ec5f250d57b733379d53f5c3e7b816d0bf0fdf5f7b02558c64b932903e5ec3fbe10c4b205" volumes: @@ -154,6 +155,7 @@ services: - fdroid:/usr/local/apache2/htdocs/repo - mapeo:/usr/local/apache2/htdocs/mapeo - mbtiles:/usr/local/apache2/htdocs/mbtiles + - offline_maps:/usr/local/apache2/htdocs/offline_maps/ restart: unless-stopped # https://hub.docker.com/r/communityfirst/pataka-cli pataka: @@ -164,3 +166,35 @@ services: - pataka:/root/.local/share/ahau-pataka environment: PATAKA_WEB_PORT: 8089 + # https://hub.docker.com/r/communityfirst/mapgl-tile-renderer + mapgl-tile-renderer: + image: communityfirst/mapgl-tile-renderer:latest + restart: unless-stopped + ports: + - 8090:8080 + volumes: + - offline_maps:/app/outputs/ + environment: + DB_TABLE: offline_maps + map-packer: + image: communityfirst/map-packer:latest + restart: unless-stopped + ports: + - 8091:8080 + environment: + ASQ_QUEUE_NAME: mappacker-requests + DATABASE: warehouse + DB_HOST: database + DB_USER: postgres + DB_PASSWORD: postgres + DB_PORT: 8083 + DB_SSL: false + DB_TABLE: offline_maps + MAP_ZOOM: 13 + MAP_LATITUDE: 2.23476 + MAP_LONGITUDE: -55.96160 + NUXT_ENV_AUTH_STRATEGY: none + OFFLINE_MAPS_URI: edt.local:8087/offline_maps/ + PORT: 8091 + VUE_APP_API_KEY: 3700dc88-b8d7-4237-bd89-3b865a3915e6 + From 74dc44345e4c0017fa072385dccf4213e16f2011 Mon Sep 17 00:00:00 2001 From: rudokemper Date: Sun, 26 May 2024 09:50:47 -0400 Subject: [PATCH 2/5] Add dockerhub url for map-packer --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d10d126..9139844 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -176,6 +176,7 @@ services: - offline_maps:/app/outputs/ environment: DB_TABLE: offline_maps + # https://hub.docker.com/r/communityfirst/map-packer map-packer: image: communityfirst/map-packer:latest restart: unless-stopped @@ -196,5 +197,4 @@ services: NUXT_ENV_AUTH_STRATEGY: none OFFLINE_MAPS_URI: edt.local:8087/offline_maps/ PORT: 8091 - VUE_APP_API_KEY: 3700dc88-b8d7-4237-bd89-3b865a3915e6 - + VUE_APP_API_KEY: 3700dc88-b8d7-4237-bd89-3b865a3915e6 From c0bd8ff4fe4e1188805e277937676e4997eb4601 Mon Sep 17 00:00:00 2001 From: rudokemper Date: Sun, 26 May 2024 10:21:34 -0400 Subject: [PATCH 3/5] Add guardianconnector-views --- balena.yml | 6 ++++-- docker-compose.yml | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/balena.yml b/balena.yml index 16bae56..22f46f3 100644 --- a/balena.yml +++ b/balena.yml @@ -49,22 +49,24 @@ data: - SYNC_INSTALLERS_NAME: INSTALLERS-edt - SYNC_TILES_ID: kfgre-slfl7 - SYNC_TILES_NAME: Map-Tiles + # Multiple services + - MAPBOX_ACCESS_TOKEN: # Terrastories - HOST_HOSTNAME: edt.local - OFFLINE_MAP_STYLE: http://edt.local:8085/styles/terrastories-map/style.json - - MAPBOX_ACCESS_TOKEN: "pk.eyJ1IjoibHVhbmRybyIsImEiOiJjanY2djRpdnkwOWdqM3lwZzVuaGIxa3VsIn0.jamcK2t2I1j3TXkUQFIsjQ" - USE_LOCAL_MAP_SERVER: "true" - RAILS_ENV: "offline" # map-packer - AZURE_STORAGE_CONNECTION_ACCOUNT_NAME: - AZURE_STORAGE_CONNECTION_STORAGE_KEY: - - MAPBOX_ACCESS_TOKEN: - MAPBOX_STYLE: - MAPBOX_STYLE_NAME: - MAP_ZOOM: - MAP_LATITUDE: - MAP_LONGITUDE: - VUE_APP_PLANET_API_KEY: + # guardianconnector-views + - NUXT_ENV_VIEWS_CONFIG: defaultDeviceType: "raspberrypi4-64" supportedDeviceTypes: - "raspberrypi3-64" diff --git a/docker-compose.yml b/docker-compose.yml index 9139844..a94933b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -198,3 +198,21 @@ services: OFFLINE_MAPS_URI: edt.local:8087/offline_maps/ PORT: 8091 VUE_APP_API_KEY: 3700dc88-b8d7-4237-bd89-3b865a3915e6 + # https://hub.docker.com/r/communityfirst/guardianconnector-views + guardianconnector-views: + image: communityfirst/guardianconnector-views:latest + restart: unless-stopped + ports: + - 8092:8080 + environment: + DATABASE: warehouse + DB_HOST: database + DB_USER: postgres + DB_PASSWORD: postgres + DB_PORT: 8083 + DB_SSL: false + SQLITE: NO + PORT: 8092 + NUXT_ENV_AUTH_STRATEGY: none + VUE_APP_API_KEY: 3700dc88-b8d7-4237-bd89-3b865a3915e6 + From dc2137ddd4f4b399c4979ee383f69a640a9f8f25 Mon Sep 17 00:00:00 2001 From: luandro Date: Sun, 26 May 2024 12:13:26 -0300 Subject: [PATCH 4/5] fix: add volume for offline maps --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index a94933b..366fa10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,7 @@ volumes: terrastories-media: terrastories-import: pataka: + offline_maps: services: # https://github.com/digidem/starter-interface balena-interface: From 1d8c13246661a673c834d812982cac90a4c6a881 Mon Sep 17 00:00:00 2001 From: rudokemper Date: Sun, 26 May 2024 15:14:58 -0400 Subject: [PATCH 5/5] Comment out map-packer for now --- docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 366fa10..61d63b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -168,15 +168,15 @@ services: environment: PATAKA_WEB_PORT: 8089 # https://hub.docker.com/r/communityfirst/mapgl-tile-renderer - mapgl-tile-renderer: - image: communityfirst/mapgl-tile-renderer:latest - restart: unless-stopped - ports: - - 8090:8080 - volumes: - - offline_maps:/app/outputs/ - environment: - DB_TABLE: offline_maps + # mapgl-tile-renderer: + # image: communityfirst/mapgl-tile-renderer:latest + # restart: unless-stopped + # ports: + # - 8090:8080 + # volumes: + # - offline_maps:/app/outputs/ + # environment: + # DB_TABLE: offline_maps # https://hub.docker.com/r/communityfirst/map-packer map-packer: image: communityfirst/map-packer:latest