zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

update makefiles

Browse Source
This commit is contained in:
Hao Liu
2023-02-27 20:49:39 -05:00
parent 633415ce13
commit c0927e1c29
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -1,4 +1,4 @@
include awx/ui_next/Makefile -include awx/ui_next/Makefile
PYTHON ?= python3.9 PYTHON ?= python3.9
OFFICIAL ?= no OFFICIAL ?= no
@@ -387,7 +387,7 @@ bulk_data:
# UI TASKS # UI TASKS
# -------------------------------------- # --------------------------------------
UI_BUILD_FLAG_FILE = $(CURDIR)/ui/.ui-built UI_BUILD_FLAG_FILE = awx/ui/.ui-built
clean-ui: clean-ui:
rm -rf node_modules rm -rf node_modules
@@ -448,7 +448,7 @@ HEADLESS ?= no
ifeq ($(HEADLESS), yes) ifeq ($(HEADLESS), yes)
dist/$(SDIST_TAR_FILE): dist/$(SDIST_TAR_FILE):
else else
dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) awx/ui_next/src/build dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) awx/ui_next/build
endif endif
$(PYTHON) -m build -s $(PYTHON) -m build -s
ln -sf $(SDIST_TAR_FILE) dist/awx.tar.gz ln -sf $(SDIST_TAR_FILE) dist/awx.tar.gz
@@ -590,7 +590,7 @@ awx-kube-dev-build: Dockerfile.kube-dev
-t $(DEV_DOCKER_TAG_BASE)/awx_kube_devel:$(COMPOSE_TAG) . -t $(DEV_DOCKER_TAG_BASE)/awx_kube_devel:$(COMPOSE_TAG) .
## Build awx image for deployment on Kubernetes environment. ## 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 \ DOCKER_BUILDKIT=1 docker build -f Dockerfile \
--build-arg VERSION=$(VERSION) \ --build-arg VERSION=$(VERSION) \
--build-arg SETUPTOOLS_SCM_PRETEND_VERSION=$(VERSION) \ --build-arg SETUPTOOLS_SCM_PRETEND_VERSION=$(VERSION) \

2
awx/ui_next/Makefile
View File

@@ -79,6 +79,6 @@ ui_next/clean: ui_next/clean/build
.PHONY: ui_next/clean/build .PHONY: ui_next/clean/build
## Clean ui_next build ## Clean ui_next build
ui_next/clean/build: ui_next/clean/build:
rm -rf $$(UI_NEXT_DIR)/build rm -rf $(UI_NEXT_DIR)/build