Skip to content

Commit 0b36a89

Browse files
authored
Mapeo bridge csv export (#47)
* chore: mapeo-bridge mapped to terrastories-import folder * fix: remove edt cloud and remove mapeo-bridge volume from demo * fix: remove unused mapeo-bridge volume * chore: up VM storage on documentation example * chore: better demo push workflow
1 parent 34a8283 commit 0b36a89

10 files changed

+12
-168
lines changed

.github/workflows/demo-pr-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Demo docker-compose Stack
1+
name: Demo docker-compose Stack Test
22
on:
33
pull_request:
44
paths:

.github/workflows/demo-push-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
script: |
2727
cd /srv/edt-offline
2828
git checkout .
29-
git pull origin main
29+
git rebase origin/main
3030
docker compose -f docker/demo/docker-compose.yml build --no-cache
3131
docker compose -f docker/demo/docker-compose.yml up -d --build

.github/workflows/local-server-pr-test .yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Local docker-compose Stack
1+
name: Local docker-compose Stack Test
22
on:
33
pull_request:
44
paths:

balena.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "Earth Defender's Toolkit Offline"
22
type: "sw.application"
3-
version: 0.4.6
3+
version: 0.4.7
44
description: "A low-energy device that creates an access-point serving applications, bridging them and exposing curated content offline.
55
Software stack and content are automatically updated while online, and can be updated offline."
66
assets:

docker-compose.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ volumes:
88
pywb-archive:
99
minio-data:
1010
installers:
11-
mapeo-bridge:
1211
postgres_data:
1312
mbtiles:
1413
bundler:
@@ -68,7 +67,9 @@ services:
6867
image: communityfirst/mapeo-bridge
6968
network_mode: host
7069
volumes:
71-
- mapeo-bridge:/usr/src/output
70+
- terrastories-import:/usr/src/output
71+
environment:
72+
CSV_PATH: /usr/src/output
7273
restart: unless-stopped
7374
# https://hub.docker.com/r/filebrowser/filebrowser
7475
filebrowser:
@@ -80,7 +81,6 @@ services:
8081
- fdroid:/srv/fdroid
8182
- installers:/srv/installers
8283
- mbtiles:/srv/mbtiles
83-
- mapeo-bridge:/srv/terrastories-places
8484
- terrastories-import:/srv/terrastories/import
8585
- terrastories-media:/srv/terrastories/media
8686
ports:

docker/cloud/.env.example

-23
This file was deleted.

docker/cloud/docker-compose.yml

-128
This file was deleted.

docker/demo/docker-compose.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ volumes:
88
pywb-archive:
99
minio-data:
1010
installers:
11-
mapeo-bridge:
1211
# Terrastories
1312
postgres_data:
1413
mbtiles:
@@ -28,13 +27,13 @@ services:
2827
image: communityfirst/mapeo-bridge
2928
network_mode: host
3029
volumes:
31-
- 'mapeo-bridge:/usr/src/output'
32-
- 'terrastories-import:/usr/src/terrastories'
30+
- terrastories-import:/usr/src/output
3331
restart: unless-stopped
3432
environment:
3533
MAPEO_PROJECT_KEY: ${MAPEO_PROJECT_KEY}
3634
MAPEO_STORAGE_PATH: ${MAPEO_STORAGE_PATH}
3735
MAPEO_TERRASTORIES_TYPE: ${MAPEO_TERRASTORIES_TYPE}
36+
CSV_PATH: /usr/src/output
3837
filebrowser:
3938
build: ../../services/filebrowser
4039
restart: unless-stopped
@@ -44,7 +43,6 @@ services:
4443
- mbtiles:/srv/mbtiles
4544
- fdroid:/srv/fdroid
4645
- installers:/srv/installers
47-
- mapeo-bridge:/srv/terrastories-places
4846
- terrastories-import:/srv/terrastories/import
4947
- terrastories-media:/srv/terrastories/media
5048
environment:
@@ -96,7 +94,6 @@ services:
9694
- pywb-archive:/webarchive
9795
- crawls:/source
9896
restart: unless-stopped
99-
# Terrastories
10097
tileserver:
10198
build: ../../services/tileserver
10299
ports:

docker/local/docker-compose.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ volumes:
88
pywb-archive:
99
minio-data:
1010
installers:
11-
mapeo-bridge:
1211
# Terrastories
1312
postgres_data:
1413
mbtiles:
@@ -40,13 +39,13 @@ services:
4039
image: communityfirst/mapeo-bridge
4140
network_mode: host
4241
volumes:
43-
- 'mapeo-bridge:/usr/src/output'
44-
- 'terrastories-import:/usr/src/terrastories'
42+
- terrastories-import:/usr/src/output
4543
restart: unless-stopped
4644
environment:
4745
MAPEO_PROJECT_KEY: ${MAPEO_PROJECT_KEY}
4846
MAPEO_STORAGE_PATH: ${MAPEO_STORAGE_PATH}
4947
MAPEO_TERRASTORIES_TYPE: ${MAPEO_TERRASTORIES_TYPE}
48+
CSV_PATH: /usr/src/output
5049
# https://hub.docker.com/r/minio/minio/
5150
minio:
5251
image: minio/minio
@@ -71,7 +70,6 @@ services:
7170
- mapeo:/srv/mapeo
7271
- fdroid:/srv/fdroid
7372
- installers:/srv/installers
74-
- mapeo-bridge:/srv/terrastories-places
7573
- terrastories-import:/srv/terrastories/import
7674
- terrastories-media:/srv/terrastories/media
7775
environment:

docs/VIRTUAL_MACHINE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ docker run -it \
1616
-e API_TOKEN="your_balena_token" \
1717
-e FLEET="your_balena_fleet" \
1818
-e MEM=1024M \
19-
-e DISK=15G \
19+
-e DISK=20G \
2020
-e DEV_MODE=true \
2121
--network host \
2222
ghcr.io/balena-labs-research/balena-virt:latest

0 commit comments

Comments
 (0)