jmm/kiwi-scp
2
0
Fork 0
Code Projects Wiki Activity

Update Makefile

Browse source 
correct "basename", %-update command
This commit is contained in:
Jörn-Michael Miehe 2019-10-17 13:45:48 +02:00 committed by GitHub
parent 9910619bf1
commit 53a2380f94
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -58,9 +58,14 @@ endif
# file to store docker network cidr # file to store docker network cidr
FILE_DOCKERNET:=$(CONF_TARGETROOT)/up-$(CONF_DOCKERNET) FILE_DOCKERNET:=$(CONF_TARGETROOT)/up-$(CONF_DOCKERNET)
# remove any suffix $2 from $1
rmsuffix=$(patsubst %$2,%,$1)
# remove project suffix from $1
projname=$(call rmsuffix,$1,$(PROJ_SUFFX))
# project directory handling # project directory handling
PROJ_WILDC:=$(wildcard *$(PROJ_SUFFX)) PROJ_WILDC:=$(wildcard *$(PROJ_SUFFX))
PROJ_NAMES:=$(patsubst %$(PROJ_SUFFX),%,$(PROJ_WILDC)) PROJ_NAMES:=$(call projname,$(PROJ_WILDC))
######### #########
# FUNCTIONS # FUNCTIONS
@ -72,7 +77,7 @@ PROJ_NAMES:=$(patsubst %$(PROJ_SUFFX),%,$(PROJ_WILDC))
kiwicompose=$(call docker_bash,\ kiwicompose=$(call docker_bash,\
cd "$<"; \ cd "$<"; \
$(CONF_SOURCE) \ $(CONF_SOURCE) \
COMPOSE_PROJECT_NAME="$(patsubst %$(PROJ_SUFFX),%,$<)" \ COMPOSE_PROJECT_NAME="$(call projname,$<)" \
CONFDIR="$(CONF_TARGETROOT)/conf" \ CONFDIR="$(CONF_TARGETROOT)/conf" \
TARGETDIR="$(CONF_TARGETROOT)/$<" \ TARGETDIR="$(CONF_TARGETROOT)/$<" \
$(DOCKER_COMPOSE) $(1)) $(DOCKER_COMPOSE) $(1))
@ -116,7 +121,7 @@ net-down: down
######### #########
# sync project config directory to variable folder # sync project config directory to variable folder
# Dockerfile for # Dockerfile for running rsync as root
define DOCKERFILE_RSYNC define DOCKERFILE_RSYNC
FROM alpine:latest FROM alpine:latest
RUN apk --no-cache add rsync RUN apk --no-cache add rsync
@ -203,14 +208,15 @@ endif
# enabling and disabling # enabling and disabling
.PHONY: %-enable %-disable .PHONY: %-enable %-disable
%-enable: %$(PROJ_SUFFX)$(DOWN_SUFFX) %-enable: %$(PROJ_SUFFX)$(DOWN_SUFFX)
mv "$<" "$(basename $<)" mv "$<" "$(call projname,$(call rmsuffix,$<,$(DOWN_SUFFX)))$(PROJ_SUFFX)"
%-disable: %$(PROJ_SUFFX) %-disable: %$(PROJ_SUFFX)
mv "$<" "$<$(DOWN_SUFFX)" mv "$<" "$<$(DOWN_SUFFX)"
# Combinations # Combinations
.PHONY: %-update .PHONY: %-update
%-update: %$(PROJ_SUFFX) %-build %-pull %-update: %$(PROJ_SUFFX) %-build %-pull copy-conf
$(MAKE) $(basename $<)-up $(MAKE) $(call projname,$<)-cmd x="restart $(x)"
$(MAKE) $(call projname,$<)-up
# Arbitrary compose command # Arbitrary compose command
.PHONY: %-cmd .PHONY: %-cmd