Skip to content

Commit 9fecf8c

Browse files
author
root
committed
test import and adjust docker compose
1 parent b59b987 commit 9fecf8c

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

docker-compose.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
context: .
88
dockerfile: docker/postgres_Dockerfile
99
volumes:
10-
- ./postgres-data:/var/lib/postgresql/data:rw
10+
- /data/postgres-data:/var/lib/postgresql/data:rw
1111
environment:
1212
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1313
POSTGRES_USER: ${POSTGRES_USER}
@@ -24,7 +24,7 @@ services:
2424
context: .
2525
dockerfile: docker/nginx_Dockerfile
2626
volumes:
27-
- ./data/:/usr/share/nginx/html:ro
27+
- /data/api-data:/usr/share/nginx/html:ro
2828
ports:
2929
- "80:80"
3030
restart: unless-stopped
@@ -39,7 +39,7 @@ services:
3939
command: ["python", "run_mapswipe_worker.py", "--modus=development", "--process=import", "--sleep_time=3600", "--max_iterations=24"]
4040
volumes:
4141
- ./cfg/:/python-mapswipe-workers/cfg/:rw
42-
- ./data/:/python-mapswipe-workers/data/:rw
42+
- /data/api-data:/python-mapswipe-workers/data/:rw
4343
- ./logs/:/python-mapswipe-workers/logs/:rw
4444
restart: unless-stopped
4545
depends_on:
@@ -54,7 +54,7 @@ services:
5454
command: ["python", "run_mapswipe_worker.py", "--modus=development", "--process=update", "--filter=active", "--sleep_time=900", "--max_iterations=96"]
5555
volumes:
5656
- ./cfg/:/python-mapswipe-workers/cfg/:rw
57-
- ./data/:/python-mapswipe-workers/data/:rw
57+
- /data/api-data:/python-mapswipe-workers/data/:rw
5858
- ./logs/:/python-mapswipe-workers/logs/:rw
5959
restart: unless-stopped
6060
depends_on:
@@ -69,7 +69,7 @@ services:
6969
command: ["python", "run_mapswipe_worker.py", "--modus=development", "--process=transfer_results", "--sleep_time=60", "--max_iterations=1440"]
7070
volumes:
7171
- ./cfg/:/python-mapswipe-workers/cfg/:rw
72-
- ./data/:/python-mapswipe-workers/data/:rw
72+
- /data/api-data:/python-mapswipe-workers/data/:rw
7373
- ./logs/:/python-mapswipe-workers/logs/:rw
7474
restart: unless-stopped
7575
depends_on:
@@ -84,7 +84,7 @@ services:
8484
command: ["python", "run_mapswipe_worker.py", "--modus=development", "--process=export", "--filter=active", "--sleep_time=900", "--max_iterations=96"]
8585
volumes:
8686
- ./cfg/:/python-mapswipe-workers/cfg/:rw
87-
- ./data/:/python-mapswipe-workers/data/:rw
87+
- /data/api-data:/python-mapswipe-workers/data/:rw
8888
- ./logs/:/python-mapswipe-workers/logs/:rw
8989
restart: unless-stopped
9090
depends_on:
@@ -99,15 +99,14 @@ services:
9999
command: "bash"
100100
volumes:
101101
- ./cfg/:/python-mapswipe-workers/cfg/:rw
102-
- ./data/:/python-mapswipe-workers/data/:rw
102+
- /data/api-data:/python-mapswipe-workers/data/:rw
103103
- ./logs/:/python-mapswipe-workers/logs/:rw
104104
- ./tests/:/python-mapswipe-workers/tests/:rw
105105
restart: "no"
106106
depends_on:
107107
- postgres
108108
networks:
109109
- mapswipe_workers_network
110-
111110
networks:
112111
mapswipe_workers_network:
113112
driver: bridge

mapswipe_workers/definitions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33

44

5-
ROOT_DIR = '/home/marcel/giscience/git/python-mapswipe-workers'
5+
ROOT_DIR = '/python-mapswipe-workers'
66
CONFIG_PATH = os.path.abspath(os.path.join(ROOT_DIR, './cfg/configuration.json'))
77
DATA_PATH = os.path.abspath(os.path.join(ROOT_DIR, './data/'))
88
# DATA_PATH = get_data_path()

tests/sample_data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"footprint_polygon_geometries": {
4646
"key": "your_key",
47-
"inputGeometries" : "https://heibox.uni-heidelberg.de/f/7a61e549b6/?dl=1",
47+
"inputGeometries" : "https://firebasestorage.googleapis.com/v0/b/dev-mapswipe.appspot.com/o/buildings_heidelberg.geojson?alt=media&token=1631f7d4-5fb2-4e1b-a133-2e14582d116c",
4848
"project" : {
4949
"image" : "http://www.fragosus.com/test/Javita.jpg",
5050
"lookFor" : "Buildings",

0 commit comments

Comments
 (0)