External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-24 04:15:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

remove websocket proxy from build-docker-machine script, freeze ui deps

Browse Source
This commit is contained in:
Leigh Johnson
2016-09-08 17:15:21 -04:00
committed by Jared Tabor
parent 9691e267df
commit 5b1d4f3d67
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/package.json
View File

@@ -7,7 +7,6 @@
}, },
"config": { "config": {
"django_port": "8013", "django_port": "8013",
"websocket_port": "8080",
"django_host": "0.0.0.0", "django_host": "0.0.0.0",
"sauce_username": "leigh-johnson", "sauce_username": "leigh-johnson",
"sauce_access_key": "f740c3ad-c706-4e10-bb95-46e2cc50c2ac" "sauce_access_key": "f740c3ad-c706-4e10-bb95-46e2cc50c2ac"
@@ -17,7 +16,7 @@
"npm": "^3.10.3" "npm": "^3.10.3"
}, },
"scripts": { "scripts": {
"build-docker-machine": "docker-machine ssh $DOCKER_MACHINE_NAME -f -N -L ${npm_package_config_websocket_port}:localhost:${npm_package_config_websocket_port}; ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev", "build-docker-machine": "ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev",
"build-docker-cid": "ip=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $DOCkER_CID` | npm set config ansible-tower:django_host ${ip}; grunt dev", "build-docker-cid": "ip=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $DOCkER_CID` | npm set config ansible-tower:django_host ${ip}; grunt dev",
"build-release": "grunt release", "build-release": "grunt release",
"pretest": "grunt clean:coverage", "pretest": "grunt clean:coverage",