diff --git a/Makefile b/Makefile index 6a7d4af5a5..db938905ef 100644 --- a/Makefile +++ b/Makefile @@ -463,18 +463,20 @@ endif # UI TASKS # -------------------------------------- awx/ui_next/node_modules: - $(NPM_BIN) --prefix awx/ui_next install + $(NPM_BIN) --prefix awx/ui_next --loglevel warn --ignore-scripts install clean-ui: rm -rf node_modules rm -rf awx/ui_next/node_modules rm -rf awx/ui_next/build + rm -rf awx/ui_next/src/locales/_build + git checkout awx/ui_next/src/locales ui-release: ui-devel ui-devel: awx/ui_next/node_modules - $(NPM_BIN) --prefix awx/ui_next run extract-strings - $(NPM_BIN) --prefix awx/ui_next run compile-strings - $(NPM_BIN) --prefix awx/ui_next run build + $(NPM_BIN) --prefix awx/ui_next --loglevel warn run extract-strings + $(NPM_BIN) --prefix awx/ui_next --loglevel warn run compile-strings + $(NPM_BIN) --prefix awx/ui_next --loglevel warn run build git checkout awx/ui_next/src/locales mkdir -p awx/public/static/css mkdir -p awx/public/static/js diff --git a/awx/ui_next/README.md b/awx/ui_next/README.md index 6841100208..2755f136d9 100644 --- a/awx/ui_next/README.md +++ b/awx/ui_next/README.md @@ -15,6 +15,19 @@ npm --prefix=awx/ui_next install npm --prefix=awx/ui_next start ``` +### Build for the Development Containers +If you just want to build a ui for the container-based awx development +environment, use these make targets: + +```shell +# The ui will be reachable at https://localhost:8043 or +# http://localhost:8013 +make ui-devel + +# clean up +make clean-ui +``` + ### Using an External Server If you normally run awx on an external host/server (in this example, `awx.local`), you'll need use the `TARGET` environment variable when starting the ui development @@ -24,18 +37,6 @@ server: TARGET='https://awx.local:8043' npm --prefix awx/ui_next start ``` -### Build for the Development Containers -If you just want to build a ui that you can use with the container-based awx -development environment, you can use these make targets: - -```shell -# The ui will be reachable at https://localhost:8043 or http://localhost:8013 -make ui-devel - -# clean up -make clean-ui -``` - ## Testing ```shell # run code formatting check