joeac/joeac.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pulls out container.mk

Browse Source
This commit is contained in:
Joe Carstairs
2026-07-01 17:11:59 +01:00
parent 9867d4f232
commit fa4d275cc0
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -18
View File
@@ -37,18 +37,6 @@ dyndns_module_target = $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(
openrc_module_target = $(if $(filter $(COMPOSE_SERVICES),$(module)),~/.config/rc/init.d/joeac.net.$(module)) openrc_module_target = $(if $(filter $(COMPOSE_SERVICES),$(module)),~/.config/rc/init.d/joeac.net.$(module))
install_submake_file = $(shell [ -f "$(module)/install.mk" ] && echo "$(module)/install.mk") install_submake_file = $(shell [ -f "$(module)/install.mk" ] && echo "$(module)/install.mk")
define build_module_rule =
.PHONY: build_$(module)
build_$(module): make_$(module) $(module).Dockerfile
podman-compose build $(module)
endef
define push_module_rule =
.PHONY: push_$(module)
push_$(module): login_registry build_$(module)
podman push $(container_image_name)
endef
define make_module_rule = define make_module_rule =
.PHONY: make_$(module) .PHONY: make_$(module)
make_$(module): $(module)/.env make_$(module): $(module)/.env
@@ -106,15 +94,9 @@ usage:
echo " make uninstall" echo " make uninstall"
$(foreach module,$(MODULES),echo " make uninstall_$(module)") $(foreach module,$(MODULES),echo " make uninstall_$(module)")
$(foreach module,$(COMPOSE_SERVICES),$(eval $(call build_module_rule)))
$(foreach module,$(COMPOSE_SERVICES),$(eval $(call push_module_rule)))
$(foreach module,$(MAKE_MODULES),$(eval $(call make_module_rule))) $(foreach module,$(MAKE_MODULES),$(eval $(call make_module_rule)))
$(foreach module,$(MODULES),$(eval $(call module_env_rule))) $(foreach module,$(MODULES),$(eval $(call module_env_rule)))
.PHONY: login_registry
login_registry:
podman login $(REGISTRY_DOMAIN)
.PHONY: install .PHONY: install
install: $(foreach module,$(MODULES),install_$(module)) install_crontab install: $(foreach module,$(MODULES),install_$(module)) install_crontab
@@ -128,6 +110,7 @@ $(foreach module,$(MODULES),$(eval $(install_module_rule)))
$(foreach module,$(MODULES),$(eval $(reinstall_module_rule))) $(foreach module,$(MODULES),$(eval $(reinstall_module_rule)))
$(foreach module,$(MODULES),$(eval $(uninstall_module_rule))) $(foreach module,$(MODULES),$(eval $(uninstall_module_rule)))
include container.mk
include openrc.mk include openrc.mk
include nginx.mk include nginx.mk
include crontab.mk include crontab.mk
container.mk
+18
View File
@@ -0,0 +1,18 @@
define build_module_rule =
.PHONY: build_$(module)
build_$(module): make_$(module) $(module).Dockerfile
podman-compose build $(module)
endef
define push_module_rule =
.PHONY: push_$(module)
push_$(module): login_registry build_$(module)
podman push $(container_image_name)
endef
$(foreach module,$(COMPOSE_SERVICES),$(eval $(call build_module_rule)))
$(foreach module,$(COMPOSE_SERVICES),$(eval $(call push_module_rule)))
.PHONY: login_registry
login_registry:
podman login $(REGISTRY_DOMAIN)