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

Move placeholder index_awx.html out of build dir

Browse Source 
- move placeholder index_awx.html out of ui_next build dir
- copy index_awx.html to build dir during development bootstrap if UI_NEXT has not been build
This commit is contained in:
Hao Liu
2023-03-20 12:25:28 -04:00
parent f558957538
commit 8d47644659
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui_next/Makefile
View File

@@ -36,6 +36,7 @@ $(UI_NEXT_DIR)/src/build: ui-next/src ui-next/src/webpack
.PHONY: ui-next/src .PHONY: ui-next/src
ui-next/src: $(UI_NEXT_DIR)/src ui-next/src: $(UI_NEXT_DIR)/src
# TODO: Rewrite this big bash script in a more readable way.
.PHONY: $(UI_NEXT_DIR)/src .PHONY: $(UI_NEXT_DIR)/src
## Real target for ui-next/src. ## Real target for ui-next/src.
$(UI_NEXT_DIR)/src: $(UI_NEXT_DIR)/src:

0
awx/ui_next/build/awx/index_awx.html → awx/ui_next/placeholder_index_awx.html
View File

7
tools/docker-compose/bootstrap_development.sh
View File

@@ -25,7 +25,12 @@ fi
# Make sure that the UI static file directory exists, Django complains otherwise. # Make sure that the UI static file directory exists, Django complains otherwise.
mkdir -p /awx_devel/awx/ui/build/static mkdir -p /awx_devel/awx/ui/build/static
mkdir -p /awx_devel/awx/ui_next/build/awx
# Make sure that the UI_NEXT statifc file directory exists, if UI_NEXT is not built yet put a placeholder file in it.
if [ ! -d "/awx_devel/awx/ui_next/build/awx" ]; then
mkdir -p /awx_devel/awx/ui_next/build/awx
cp /awx_devel/awx/ui_next/placeholder_index_awx.html /awx_devel/awx/ui_next/build/awx/index_awx.html
fi
if output=$(awx-manage createsuperuser --noinput --username=admin --email=admin@localhost 2> /dev/null); then if output=$(awx-manage createsuperuser --noinput --username=admin --email=admin@localhost 2> /dev/null); then
echo $output echo $output