diff options
| author | Jeff Bradberry <jeff.bradberry@gmail.com> | 2022-10-26 23:51:29 +0200 |
|---|---|---|
| committer | Jeff Bradberry <jeff.bradberry@gmail.com> | 2022-10-26 23:51:29 +0200 |
| commit | 8f4c329c2a6ad69085367f1c710d2ce4b3b9bf9f (patch) | |
| tree | 94de0e8f4f514b2c30200fe5148df6fcbf7a9742 /tools | |
| parent | Merge pull request #12942 from Tioborto/fix/ui-host-vent-modal (diff) | |
| download | awx-8f4c329c2a6ad69085367f1c710d2ce4b3b9bf9f.tar.xz awx-8f4c329c2a6ad69085367f1c710d2ce4b3b9bf9f.zip | |
UI static files are now directly copied to the proper static dir
when running `make ui-devel`. Previously they were going to
/awx_devel/awx/public/static, but that directory is no longer being
served up by nginx, which forced us to have to run `make
collectstatic` (or equivalent) to get the files to the right place.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/docker-compose/bootstrap_development.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh index f470e6624e..8029fcb163 100755 --- a/tools/docker-compose/bootstrap_development.sh +++ b/tools/docker-compose/bootstrap_development.sh @@ -19,6 +19,9 @@ else wait-for-migrations fi +# Make sure that the UI static file directory exists, Django complains otherwise. +mkdir -p /awx_devel/awx/ui/build/static + if output=$(awx-manage createsuperuser --noinput --username=admin --email=admin@localhost 2> /dev/null); then echo $output fi @@ -27,10 +30,6 @@ echo "Admin password: ${DJANGO_SUPERUSER_PASSWORD}" awx-manage create_preload_data awx-manage register_default_execution_environments -mkdir -p /awx_devel/awx/public/static -mkdir -p /awx_devel/awx/ui/static -mkdir -p /awx_devel/awx/ui/build/static - awx-manage provision_instance --hostname="$(hostname)" --node_type="$MAIN_NODE_TYPE" awx-manage register_queue --queuename=controlplane --instance_percent=100 awx-manage register_queue --queuename=default --instance_percent=100 |