diff --git a/.gitignore b/.gitignore index 0ecdb823a2..1e48c997b8 100644 --- a/.gitignore +++ b/.gitignore @@ -157,7 +157,6 @@ use_dev_supervisor.txt *.unison.tmp *.# /awx/ui/.ui-built -/awx/ui_next/.ui-built /Dockerfile /_build/ /_build_kube_dev/ diff --git a/awx/ui_next/Makefile b/awx/ui_next/Makefile index 3e7f77bf9e..5e92419389 100644 --- a/awx/ui_next/Makefile +++ b/awx/ui_next/Makefile @@ -1,8 +1,8 @@ ## UI_NEXT_DIR: Relative path to the directory containing this Makefile UI_NEXT_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) -# ## Path to your local clone of the UI_NEXT repo -# # NOTE: you will not be able to build within the docker-compose development environment if you use this option +## Path to your local clone of the UI_NEXT repo +# NOTE: you will not be able to build within the docker-compose development environment if you use this option UI_NEXT_LOCAL ?= # Git repo and branch to the UI_NEXT repo diff --git a/awx/ui_next/README.md b/awx/ui_next/README.md index 77d719e050..8835cb3381 100644 --- a/awx/ui_next/README.md +++ b/awx/ui_next/README.md @@ -2,25 +2,27 @@ ## Set src of the ui_next repo -### via GIT +### Via GIT ```bash -export UI_NEXT_GIT_BRANCH_REPO=https:// +export UI_NEXT_GIT_REPO=https:// ``` or ```bash -export UI_NEXT_GIT_BRANCH_REPO=git@ +export UI_NEXT_GIT_REPO=git@ ``` optionally set branch (default is main) ```bash -export UI_NEXT_GIT_BRANCH_BRANCH=main +export UI_NEXT_GIT_BRANCH=main ``` -### via symlink to existing clone +### Via symlink to existing clone + +NOTE: UI_NEXT_LOCAL have higher precedence than UI_NEXT_GIT_REPO, if UI_NEXT_LOCAL is set, UI_NEXT_GIT_REPO will be ignored. ```bash export UI_NEXT_LOCAL = /path/to/your/ui_next