diff --git a/config/environment.js b/config/environment.js index 24eeae0..c59fcc6 100644 --- a/config/environment.js +++ b/config/environment.js @@ -17,7 +17,7 @@ module.exports = function(environment) { // Here you can pass flags/options to your application instance // when it is created - API_HOST: '', + API_HOST: 'http://localhost:80', UPDATE_RATE: 200, }, @@ -25,7 +25,7 @@ module.exports = function(environment) { 'default-src': "'none'", 'script-src': "'self' 'unsafe-eval'", 'font-src': "'self'", - 'connect-src': "'self' 192.168.99.100:80", + 'connect-src': "'self' 192.168.99.100:80 localhost:80", 'img-src': "'self'", 'style-src': "'self' 'unsafe-inline'", 'media-src': "'self'" @@ -60,7 +60,7 @@ module.exports = function(environment) { } if (environment === 'production') { - ENV.baseURL = '/technical/'; + } return ENV; diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..7e0a00b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,32 @@ +nginx: + image: nginx + volumes: + - ./nginx-conf.d/:/etc/nginx/conf.d/ + - ./dist/:/www/ + links: + - orion + - ember + ports: + - "80:80" + +ember: + image: danlynn/ember-cli + volumes: + - .:/myapp + command: build -prod + +mongo: + image: mongo:3.2 + command: --smallfiles --nojournal + +orion: + image: fiware/orion + links: + - mongo + command: -dbhost mongo + +playback: + image: acs/playback + links: + - orion + command: orion:1026 m1_S1_ElectricalGrid_data.txt diff --git a/nginx-conf.d/default.conf b/nginx-conf.d/default.conf index 3c37efe..2950dc4 100644 --- a/nginx-conf.d/default.conf +++ b/nginx-conf.d/default.conf @@ -28,6 +28,11 @@ server { proxy_pass http://orion:1026/; } + # website + location / { + root /www; + } + error_page 404 /404.html; location = /404.html { root /usr/share/nginx/html;