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

make dev-env test pass

Browse Source
This commit is contained in:
Hao Liu
2023-03-16 14:06:10 -04:00
parent edbed92c95
commit ae0d868681
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -420,7 +420,7 @@ ui-devel: awx/ui/node_modules
cp -r awx/ui/build/static/css/* /var/lib/awx/public/static/css; \ cp -r awx/ui/build/static/css/* /var/lib/awx/public/static/css; \
cp -r awx/ui/build/static/js/* /var/lib/awx/public/static/js; \ cp -r awx/ui/build/static/js/* /var/lib/awx/public/static/js; \
cp -r awx/ui/build/static/media/* /var/lib/awx/public/static/media; \ cp -r awx/ui/build/static/media/* /var/lib/awx/public/static/media; \
fi fi
ui-devel-instrumented: awx/ui/node_modules ui-devel-instrumented: awx/ui/node_modules
$(NPM_BIN) --prefix awx/ui --loglevel warn run start-instrumented $(NPM_BIN) --prefix awx/ui --loglevel warn run start-instrumented
@@ -655,13 +655,7 @@ help/generate:
{ lastLine = $$0 }' $(MAKEFILE_LIST) | sort -u { lastLine = $$0 }' $(MAKEFILE_LIST) | sort -u
@printf "\n" @printf "\n"
## Display help for a specific target folder ## Display help for ui-next targets
help/%:
@make -s help MAKEFILE_LIST="$*/Makefile"
help/ui-next: help/ui-next:
@make -s help MAKEFILE_LIST="awx/ui_next/Makefile" @make -s help MAKEFILE_LIST="awx/ui_next/Makefile"
## Display help for a specific target folder
help/%/aliases:
@make -s help/all MAKEFILE_LIST="$*/Makefile.aliases"

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

@@ -25,6 +25,7 @@ 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
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