STI
/
myos
3
2
Fork 1
Code Issues 3 Pull Requests Projects Releases Wiki Activity

wip

This commit is contained in:
aynic.os 2021-06-01 00:52:21 +02:00
parent e605e033e4
commit f510f626ab
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/apps/common.mk
View File

@ -111,12 +111,11 @@ tests: app-tests ## Test application
up: docker-compose-up app-start ## Create application dockers up: docker-compose-up app-start ## Create application dockers
.PHONY: update app-update .PHONY: update app-update
update: app-update ## Update application update: update-app app-update ## Update application
# target %: Always fired target # target %: Always fired target
## this target is fired everytime make is runned to call the stack target and ## this target is fired everytime make is runned to call the stack target and
## update COMPOSE_FILE variable with all .yml files of the current project stack ## update COMPOSE_FILE variable with all .yml files of the current project stack
.PHONY: FORCE
%: FORCE stack %-rule-exists ; %: FORCE stack %-rule-exists ;
# target %-rule-exists: Print a warning message if $* target does not exists # target %-rule-exists: Print a warning message if $* target does not exists

1
make/apps/def.mk
View File

@ -1,7 +1,6 @@
APP_DIR ?= $(CURDIR) APP_DIR ?= $(CURDIR)
APP_DOMAIN ?= $(ENV)$(addprefix .,$(DOMAIN)) APP_DOMAIN ?= $(ENV)$(addprefix .,$(DOMAIN))
APP_HOST ?= $(APP)$(addprefix .,$(APP_DOMAIN)) APP_HOST ?= $(APP)$(addprefix .,$(APP_DOMAIN))
APP_NAME ?= $(APP)
APP_PARAMETERS_REPOSITORY ?= $(GIT_PARAMETERS_REPOSITORY) APP_PARAMETERS_REPOSITORY ?= $(GIT_PARAMETERS_REPOSITORY)
APP_PATH ?= /$(APP_PATH_PREFIX) APP_PATH ?= /$(APP_PATH_PREFIX)
APP_REPOSITORY ?= $(GIT_REPOSITORY) APP_REPOSITORY ?= $(GIT_REPOSITORY)

2
make/def.mk
View File

@ -3,6 +3,7 @@ dollar ?= $
dquote ?= " dquote ?= "
quote ?= ' quote ?= '
APP ?= $(if $(wildcard .git),$(notdir $(CURDIR))) APP ?= $(if $(wildcard .git),$(notdir $(CURDIR)))
APP_NAME ?= $(APP)
APP_TYPE ?= $(if $(SUBREPO),subrepo) $(if $(MYOS),,myos) APP_TYPE ?= $(if $(SUBREPO),subrepo) $(if $(MYOS),,myos)
APPS ?= $(if $(MONOREPO),$(sort $(patsubst $(MONOREPO_DIR)/%/.git,%,$(wildcard $(MONOREPO_DIR)/*/.git)))) APPS ?= $(if $(MONOREPO),$(sort $(patsubst $(MONOREPO_DIR)/%/.git,%,$(wildcard $(MONOREPO_DIR)/*/.git))))
APPS_NAME ?= $(foreach app,$(APPS),$(or $(shell awk -F '=' '$$1 == "APP" {print $$2}' $(or $(wildcard $(MONOREPO_DIR)/$(app)/.env),$(wildcard $(MONOREPO_DIR)/$(app)/.env.$(ENV)),$(MONOREPO_DIR)/$(app)/.env.dist) 2>/dev/null),$(app))) APPS_NAME ?= $(foreach app,$(APPS),$(or $(shell awk -F '=' '$$1 == "APP" {print $$2}' $(or $(wildcard $(MONOREPO_DIR)/$(app)/.env),$(wildcard $(MONOREPO_DIR)/$(app)/.env.$(ENV)),$(MONOREPO_DIR)/$(app)/.env.dist) 2>/dev/null),$(app)))
@ -44,6 +45,7 @@ MAKE_VARS ?= ENV
MONOREPO ?= $(if $(filter myos,$(MYOS)),$(notdir $(CURDIR)),$(if $(APP),$(notdir $(realpath $(CURDIR)/..)))) MONOREPO ?= $(if $(filter myos,$(MYOS)),$(notdir $(CURDIR)),$(if $(APP),$(notdir $(realpath $(CURDIR)/..))))
MONOREPO_DIR ?= $(if $(MONOREPO),$(if $(filter myos,$(MYOS)),$(realpath $(CURDIR)),$(if $(APP),$(realpath $(CURDIR)/..)))) MONOREPO_DIR ?= $(if $(MONOREPO),$(if $(filter myos,$(MYOS)),$(realpath $(CURDIR)),$(if $(APP),$(realpath $(CURDIR)/..))))
MYOS ?= $(if $(filter $(MAKE_DIR),$(call pop,$(MAKE_DIR))),,$(call pop,$(MAKE_DIR))) MYOS ?= $(if $(filter $(MAKE_DIR),$(call pop,$(MAKE_DIR))),,$(call pop,$(MAKE_DIR)))
QUIET ?= $(if $(filter false,$(VERBOSE)),--quiet)
RECURSIVE ?= true RECURSIVE ?= true
SHARED ?= shared SHARED ?= shared
SSH_DIR ?= ${HOME}/.ssh SSH_DIR ?= ${HOME}/.ssh

1
make/help.mk
View File

@ -3,6 +3,7 @@ COLOR_RESET ?= \033[0m
COLOR_GREEN ?= \033[32m COLOR_GREEN ?= \033[32m
COLOR_BROWN ?= \033[33m COLOR_BROWN ?= \033[33m
COLOR_BLUE ?= \033[36m COLOR_BLUE ?= \033[36m
.PHONY: FORCE
## ##
# HELP # HELP

17
make/update.mk
View File

@ -1,11 +1,20 @@
## ##
# UPDATE # UPDATE
.PHONY: update-parameters .PHONY: update-apps
update-app: $(APP) ## Update application source files update-apps:
$(foreach app,$(APPS),$(call make,update-app APP_NAME=$(app)))
$(APP): myos-base .PHONY: update-app
$(call exec,[ -d ../$(APP) ] && cd ../$(APP) && git pull --quiet origin $(BRANCH) || git clone --quiet $(APP_REPOSITORY) ../$(APP)) update-app: update-app-$(APP_NAME) ; ## Update application source files
.PHONY: update-app-%
update-app-%: myos-base % ;
.PHONY: $(APP)
$(APP): APP_DIR := $(if $(filter myos,$(MYOS)),,../)$(APP)
$(APP):
$(call exec,[ -d $(APP_DIR) ] && cd $(APP_DIR) && git pull $(QUIET) origin $(BRANCH) || git clone $(QUIET) $(APP_REPOSITORY) $(APP_DIR))
## Update /etc/hosts ## Update /etc/hosts
.PHONY: update-hosts .PHONY: update-hosts