diff options
| author | Hao Liu <haoli@redhat.com> | 2023-02-21 22:40:47 +0100 |
|---|---|---|
| committer | Hao Liu <haoli@redhat.com> | 2023-03-17 04:34:30 +0100 |
| commit | f53aa2d26ba3836bd552899d121ea74165a5c21d (patch) | |
| tree | 7e1621e522062fc05b358adaf77baf6d442a5463 /Makefile | |
| parent | Add banner to dashboard page. (diff) | |
| download | awx-f53aa2d26ba3836bd552899d121ea74165a5c21d.tar.xz awx-f53aa2d26ba3836bd552899d121ea74165a5c21d.zip | |
Build and serve UI_NEXT
- Add new makefile for building ui_next
- Add setting to toggle ui_next
- Add URL path for displaying ui_next
- Update collectstatic and template dir config to serve ui_next
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,5 @@ +-include awx/ui_next/Makefile + PYTHON ?= python3.9 DOCKER_COMPOSE ?= docker-compose OFFICIAL ?= no @@ -449,7 +451,7 @@ HEADLESS ?= no ifeq ($(HEADLESS), yes) dist/$(SDIST_TAR_FILE): else -dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) +dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) awx/ui_next/build endif $(PYTHON) -m build -s ln -sf $(SDIST_TAR_FILE) dist/awx.tar.gz @@ -497,8 +499,6 @@ docker-compose-sources: .git/hooks/pre-commit -e enable_prometheus=$(PROMETHEUS) \ -e enable_grafana=$(GRAFANA) $(EXTRA_SOURCES_ANSIBLE_OPTS) - - docker-compose: awx/projects docker-compose-sources $(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml $(COMPOSE_OPTS) up $(COMPOSE_UP_OPTS) --remove-orphans @@ -592,7 +592,7 @@ awx-kube-dev-build: Dockerfile.kube-dev -t $(DEV_DOCKER_TAG_BASE)/awx_kube_devel:$(COMPOSE_TAG) . ## Build awx image for deployment on Kubernetes environment. -awx-kube-build: Dockerfile +awx-kube-build: Dockerfile awx/ui_next/src DOCKER_BUILDKIT=1 docker build -f Dockerfile \ --build-arg VERSION=$(VERSION) \ --build-arg SETUPTOOLS_SCM_PRETEND_VERSION=$(VERSION) \ @@ -654,3 +654,11 @@ help/generate: } \ { lastLine = $$0 }' $(MAKEFILE_LIST) | sort -u @printf "\n" + +## Display help for a specific target folder +help/%: + @make -s help MAKEFILE_LIST="$*/Makefile" + +## Display help for a specific target folder +help/%/aliases: + @make -s help/all MAKEFILE_LIST="$*/Makefile.aliases" |