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

Simplify UI / Docker targets

Browse Source 
- Renamed npm scripts to reflect what they are actually doing. Nothing is being built here!
- Not sure why the default django_host was 0.0.0.0…
- Removed unnecessary logic from build-docker-cid
This commit is contained in:
Shane McDonald
2017-01-25 18:34:18 -05:00
parent 7776dc1304
commit 35deb0be37
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -577,11 +577,11 @@ $(UI_DEPS_FLAG_FILE):
touch $(UI_DEPS_FLAG_FILE) touch $(UI_DEPS_FLAG_FILE)
ui-docker-machine: $(UI_DEPS_FLAG_FILE) ui-docker-machine: $(UI_DEPS_FLAG_FILE)
$(NPM_BIN) --prefix awx/ui run build-docker-machine -- $(MAKEFLAGS) $(NPM_BIN) --prefix awx/ui run ui-docker-machine -- $(MAKEFLAGS)
# Native docker. Builds UI and raises BrowserSync & filesystem polling. # Native docker. Builds UI and raises BrowserSync & filesystem polling.
ui-docker: $(UI_DEPS_FLAG_FILE) ui-docker: $(UI_DEPS_FLAG_FILE)
$(NPM_BIN) --prefix awx/ui run build-docker-cid -- $(MAKEFLAGS) $(NPM_BIN) --prefix awx/ui run ui-docker -- $(MAKEFLAGS)
# Builds UI with development UI without raising browser-sync or filesystem polling. # Builds UI with development UI without raising browser-sync or filesystem polling.
ui-devel: $(UI_DEPS_FLAG_FILE) ui-devel: $(UI_DEPS_FLAG_FILE)

6
awx/ui/package.json
View File

@@ -7,15 +7,15 @@
}, },
"config": { "config": {
"django_port": "8043", "django_port": "8043",
"django_host": "0.0.0.0", "django_host": "localhost"
}, },
"engines": { "engines": {
"node": "^6.3.1", "node": "^6.3.1",
"npm": "^3.10.3" "npm": "^3.10.3"
}, },
"scripts": { "scripts": {
"build-docker-machine": "ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev;", "ui-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;", "ui-docker": "grunt dev;",
"build-devel": "grunt devNoSync", "build-devel": "grunt devNoSync",
"pot": "grunt nggettext_extract", "pot": "grunt nggettext_extract",
"languages": "grunt nggettext_compile", "languages": "grunt nggettext_compile",