Merge pull request #8886 from jakemcdermott/make-readme-updates

More readme and makefile updates

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
             https://github.com/jakemcdermott
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-12-15 17:05:36 +00:00 committed by GitHub
commit f66485ff12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions

View File

@ -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

View File

@ -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