DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Cleanup webapp (dev & serving), add workflow

Browse Source
This commit is contained in:
Denis Arh
2021-03-18 09:11:42 +01:00
parent 261ad71460
commit 4a1eb465ab
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -1
View File
@@ -1,4 +1,4 @@
.PHONY: pack build help qa critic vet codegen provision docs build auth
.PHONY: pack build help qa critic vet codegen provision docs build auth webapp
include Makefile.inc
@@ -142,6 +142,10 @@ clean.codegen:
provision:
$(MAKE) --directory=provision clean all
webapp:
$(MAKE) --directory=webapp install
#######################################################################################################################
# Quality Assurance
app/servers.go
+1
View File
@@ -135,6 +135,7 @@ func (app *CortezaApp) mountHttpRoutes(r chi.Router) {
"client web applications enabled",
zap.String("baseUrl", app.Opt.HTTPServer.WebappBaseUrl),
zap.String("baseDir", app.Opt.HTTPServer.WebappBaseDir),
zap.Strings("apps", strings.Split(app.Opt.HTTPServer.WebappList, ",")),
)
} else {
app.Log.Info("client web applications disabled")
webapp/Makefile
+3 -3
View File
@@ -3,9 +3,9 @@ WGET_FLAGS ?= -q
TAR ?= tar
TAR_FLAGS ?= -xzmok
RELEASE_PAGE ?= https://releases.cortezaproject.org/files
APPS ?= auth admin compose
APPS ?= admin compose workflow
ALL_APPS ?= $(APPS) one
VERSION ?= unstable
VERSION ?= 2021.3.0-rc.1
PACKAGES = $(addprefix corteza-webapp-,$(addsuffix -$(VERSION).tar.gz,$(ALL_APPS)))
all: install
@@ -14,9 +14,9 @@ install: $(PACKAGES)
rm -rf $(addprefix public/,$(APPS))
mkdir -p $(addprefix public/,$(APPS))
$(TAR) $(TAR_FLAGS) -f corteza-webapp-one-$(VERSION).tar.gz -C public
$(TAR) $(TAR_FLAGS) -f corteza-webapp-auth-$(VERSION).tar.gz -C public/auth
$(TAR) $(TAR_FLAGS) -f corteza-webapp-admin-$(VERSION).tar.gz -C public/admin
$(TAR) $(TAR_FLAGS) -f corteza-webapp-compose-$(VERSION).tar.gz -C public/compose
$(TAR) $(TAR_FLAGS) -f corteza-webapp-workflow-$(VERSION).tar.gz -C public/workflow
download: $(PACKAGES)