mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-09 00:00:01 +01:00
Change docker-compose-dev.yml to start develop tools
Fix jQuery version in bower.json docker-compose-dev.yml starts all tools needed to run 'ember s' successfully. NGinX proxies the context broker
This commit is contained in:
parent
90f5bc608d
commit
acaa7635e1
4 changed files with 22 additions and 24 deletions
|
@ -9,7 +9,7 @@
|
|||
"ember-qunit": "0.4.9",
|
||||
"ember-qunit-notifications": "0.0.7",
|
||||
"ember-resolver": "~0.1.18",
|
||||
"jquery": "^1.11.3",
|
||||
"jquery": "1.11.3",
|
||||
"loader.js": "ember-cli/loader.js#3.2.1",
|
||||
"qunit": "~1.18.0",
|
||||
"pretender": "~0.9.0",
|
||||
|
|
|
@ -26,7 +26,7 @@ module.exports = function(environment) {
|
|||
'default-src': "'none'",
|
||||
'script-src': "'self' 'unsafe-eval'",
|
||||
'font-src': "'self'",
|
||||
'connect-src': "'self' 46.101.131.212:80",
|
||||
'connect-src': "'self' 192.168.99.100:80",
|
||||
'img-src': "'self'",
|
||||
'style-src': "'self' 'unsafe-inline'",
|
||||
'media-src': "'self'"
|
||||
|
@ -45,7 +45,7 @@ module.exports = function(environment) {
|
|||
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
|
||||
// ENV.APP.LOG_VIEW_LOOKUPS = true;
|
||||
|
||||
ENV.APP.API_HOST = 'http://46.101.131.212:80';
|
||||
ENV.APP.API_HOST = 'http://192.168.99.100:80';
|
||||
}
|
||||
|
||||
if (environment === 'test') {
|
||||
|
|
|
@ -1,17 +1,24 @@
|
|||
ember: &defaults
|
||||
image: danlynn/ember-cli
|
||||
nginx:
|
||||
image: nginx
|
||||
volumes:
|
||||
- .:/myapp
|
||||
command: server --watcher polling
|
||||
- ./nginx.default.conf:/etc/nginx/conf.d/default.conf
|
||||
links:
|
||||
- orion
|
||||
ports:
|
||||
- "4200:4200"
|
||||
- "35729:35729"
|
||||
- "80:80"
|
||||
|
||||
npm:
|
||||
<<: *defaults
|
||||
entrypoint: ['/usr/local/bin/npm']
|
||||
mongo:
|
||||
image: mongo:3.2
|
||||
command: --smallfiles --nojournal
|
||||
|
||||
bower:
|
||||
<<: *defaults
|
||||
entrypoint: ['/usr/local/bin/bower', '--allow-root']
|
||||
orion:
|
||||
image: fiware/orion
|
||||
links:
|
||||
- mongo
|
||||
command: -dbhost mongo
|
||||
|
||||
playback:
|
||||
image: acs/playback
|
||||
links:
|
||||
- orion
|
||||
command: orion:1026 m1_S1_ElectricalGrid_data.txt
|
||||
|
|
|
@ -28,15 +28,6 @@ server {
|
|||
proxy_pass http://orion:1026/;
|
||||
}
|
||||
|
||||
# proxy for ember-cli
|
||||
location / {
|
||||
proxy_redirect off;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
|
||||
proxy_pass http://ember:4200/;
|
||||
}
|
||||
|
||||
error_page 404 /404.html;
|
||||
location = /404.html {
|
||||
root /usr/share/nginx/html;
|
||||
|
|
Loading…
Add table
Reference in a new issue