Skip to content

Commit

Permalink
Mapeo bridge csv export (#47)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
luandro authored Mar 28, 2023
1 parent 34a8283 commit 0b36a89
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 168 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/demo-pr-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Demo docker-compose Stack
name: Demo docker-compose Stack Test
on:
pull_request:
paths:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/demo-push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ jobs:
script: |
cd /srv/edt-offline
git checkout .
git pull origin main
git rebase origin/main
docker compose -f docker/demo/docker-compose.yml build --no-cache
docker compose -f docker/demo/docker-compose.yml up -d --build
2 changes: 1 addition & 1 deletion .github/workflows/local-server-pr-test .yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Local docker-compose Stack
name: Local docker-compose Stack Test
on:
pull_request:
paths:
Expand Down
2 changes: 1 addition & 1 deletion balena.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "Earth Defender's Toolkit Offline"
type: "sw.application"
version: 0.4.6
version: 0.4.7
description: "A low-energy device that creates an access-point serving applications, bridging them and exposing curated content offline.
Software stack and content are automatically updated while online, and can be updated offline."
assets:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ volumes:
pywb-archive:
minio-data:
installers:
mapeo-bridge:
postgres_data:
mbtiles:
bundler:
Expand Down Expand Up @@ -68,7 +67,9 @@ services:
image: communityfirst/mapeo-bridge
network_mode: host
volumes:
- mapeo-bridge:/usr/src/output
- terrastories-import:/usr/src/output
environment:
CSV_PATH: /usr/src/output
restart: unless-stopped
# https://hub.docker.com/r/filebrowser/filebrowser
filebrowser:
Expand All @@ -80,7 +81,6 @@ services:
- fdroid:/srv/fdroid
- installers:/srv/installers
- mbtiles:/srv/mbtiles
- mapeo-bridge:/srv/terrastories-places
- terrastories-import:/srv/terrastories/import
- terrastories-media:/srv/terrastories/media
ports:
Expand Down
23 changes: 0 additions & 23 deletions docker/cloud/.env.example

This file was deleted.

128 changes: 0 additions & 128 deletions docker/cloud/docker-compose.yml

This file was deleted.

7 changes: 2 additions & 5 deletions docker/demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ volumes:
pywb-archive:
minio-data:
installers:
mapeo-bridge:
# Terrastories
postgres_data:
mbtiles:
Expand All @@ -28,13 +27,13 @@ services:
image: communityfirst/mapeo-bridge
network_mode: host
volumes:
- 'mapeo-bridge:/usr/src/output'
- 'terrastories-import:/usr/src/terrastories'
- terrastories-import:/usr/src/output
restart: unless-stopped
environment:
MAPEO_PROJECT_KEY: ${MAPEO_PROJECT_KEY}
MAPEO_STORAGE_PATH: ${MAPEO_STORAGE_PATH}
MAPEO_TERRASTORIES_TYPE: ${MAPEO_TERRASTORIES_TYPE}
CSV_PATH: /usr/src/output
filebrowser:
build: ../../services/filebrowser
restart: unless-stopped
Expand All @@ -44,7 +43,6 @@ services:
- mbtiles:/srv/mbtiles
- fdroid:/srv/fdroid
- installers:/srv/installers
- mapeo-bridge:/srv/terrastories-places
- terrastories-import:/srv/terrastories/import
- terrastories-media:/srv/terrastories/media
environment:
Expand Down Expand Up @@ -96,7 +94,6 @@ services:
- pywb-archive:/webarchive
- crawls:/source
restart: unless-stopped
# Terrastories
tileserver:
build: ../../services/tileserver
ports:
Expand Down
6 changes: 2 additions & 4 deletions docker/local/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ volumes:
pywb-archive:
minio-data:
installers:
mapeo-bridge:
# Terrastories
postgres_data:
mbtiles:
Expand Down Expand Up @@ -40,13 +39,13 @@ services:
image: communityfirst/mapeo-bridge
network_mode: host
volumes:
- 'mapeo-bridge:/usr/src/output'
- 'terrastories-import:/usr/src/terrastories'
- terrastories-import:/usr/src/output
restart: unless-stopped
environment:
MAPEO_PROJECT_KEY: ${MAPEO_PROJECT_KEY}
MAPEO_STORAGE_PATH: ${MAPEO_STORAGE_PATH}
MAPEO_TERRASTORIES_TYPE: ${MAPEO_TERRASTORIES_TYPE}
CSV_PATH: /usr/src/output
# https://hub.docker.com/r/minio/minio/
minio:
image: minio/minio
Expand All @@ -71,7 +70,6 @@ services:
- mapeo:/srv/mapeo
- fdroid:/srv/fdroid
- installers:/srv/installers
- mapeo-bridge:/srv/terrastories-places
- terrastories-import:/srv/terrastories/import
- terrastories-media:/srv/terrastories/media
environment:
Expand Down
2 changes: 1 addition & 1 deletion docs/VIRTUAL_MACHINE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ docker run -it \
-e API_TOKEN="your_balena_token" \
-e FLEET="your_balena_fleet" \
-e MEM=1024M \
-e DISK=15G \
-e DISK=20G \
-e DEV_MODE=true \
--network host \
ghcr.io/balena-labs-research/balena-virt:latest
Expand Down

0 comments on commit 0b36a89

Please sign in to comment.