Fix electricitymaps#44

backend/parsers/solar.py

@@ -44,7 +44,7 @@ def fetch_solar():
         'forecasts': [obj_before, obj_after]
     }
 
-    with gzip.open('data/solar.json.gz', 'w') as f:
+    with gzip.open('public/data/solar.json.gz', 'w') as f:
         json.dump(obj, f)
     print 'Done'
 

backend/parsers/wind.py

@@ -50,7 +50,7 @@ def fetch_wind():
         '-Xmx512M',
         '-jar', 'grib2json/grib2json-0.8.0-SNAPSHOT/lib/grib2json-0.8.0-SNAPSHOT.jar',
         '-d', '-n', '-c', '-o',
-        'data/wind_before.json', 'wind.grb2'], shell=False)
+        'public/data/wind_before.json', 'wind.grb2'], shell=False)
 
     # Fetch the forecast after
     _ = fetch_forecast(origin, horizon.replace(hours=+MULTIPLE_HORIZON))
@@ -59,11 +59,11 @@ def fetch_wind():
         '-Xmx512M',
         '-jar', 'grib2json/grib2json-0.8.0-SNAPSHOT/lib/grib2json-0.8.0-SNAPSHOT.jar',
         '-d', '-n', '-c', '-o',
-        'data/wind_after.json', 'wind.grb2'], shell=False)
+        'public/data/wind_after.json', 'wind.grb2'], shell=False)
 
-    with open('data/wind_before.json') as f_before, \
-        open('data/wind_after.json') as f_after, \
-        gzip.open('data/wind.json.gz', 'w') as f_out:
+    with open('public/data/wind_before.json') as f_before, \
+        open('public/data/wind_after.json') as f_after, \
+        gzip.open('public/data/wind.json.gz', 'w') as f_out:
         obj = {
             'forecasts': [json.load(f_before), json.load(f_after)]
         }

docker-compose.yml

@@ -6,12 +6,9 @@ services:
       service: web
     ports: ['8000:8000']
     volumes:
-      - './app:/home/app'
-      - './vendor:/home/vendor'
+      - './public:/home/public'
       - './backend:/home/backend'
       - './server.py:/home/server.py'
-      - './style.css:/home/style.css'
-      - './index.html:/home/index.html'
     environment: [ENV=development, 'MONGO_URL=mongodb://mongo:27017']
     depends_on: [mongo]
   mongo:

production.yaml

@@ -13,7 +13,7 @@ services:
     depends_on: [mongo]
     networks: [default, infrastructure] # required to be able to com' with statsd & nginx
     command: uwsgi --ini uwsgi.ini
-    volumes: ['/home/shared/electricitymap/data:/home/data']
+    volumes: ['/home/shared/electricitymap/data:/home/public/data']
   feeder:
     image: electricitymap_web
     environment:
@@ -24,7 +24,7 @@ services:
     depends_on: [mongo]
     networks: [default, infrastructure] # required to be able to com' with statsd
     command: python -u backend/feeder.py
-    volumes: ['/home/shared/electricitymap/data:/home/data']
+    volumes: ['/home/shared/electricitymap/data:/home/public/data']
   mongo:
     image: mongo
     volumes: ['/home/shared/electricitymap/mongodata:/data/db']