From daad060e6c2402528785434ce2b30194793de0b1 Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Sat, 10 Dec 2022 13:31:41 +0000
Subject: [PATCH] multi domain HOST_LB=true

---
 Makefile                          | 31 ++++++++++++++++++++-----------
 docker/{stack.mk => astroport.mk} |  5 ++++-
 2 files changed, 24 insertions(+), 12 deletions(-)
 rename docker/{stack.mk => astroport.mk} (68%)

diff --git a/Makefile b/Makefile
index 402b1801..e68d645c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,37 +4,46 @@ MYOS_REPOSITORY                 ?= https://github.com/aynicos/myos
 $(MYOS):
 	-@git clone $(MYOS_REPOSITORY) $(MYOS)
 
-.PHONY: all install shellcheck shellcheck-% tests
 SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh)
 
+.PHONY: all
 all: install tests
 
-install: upgrade build myos-host up player
-
-upgrade: migrate-ipfs migrate-zen
-	echo "Welcome to myos docker land - make a user - make a player -"
+.PHONY: install
+install: upgrade build myos up player
 
+.PHONY: migrate
+migrate-%: home := ~/.zen/game/players
 migrate-%:
-	[ ! -f /var/lib/docker/volumes/$(HOSTNAME)_$*/_data ] \
-	&& $(RUN) $(SUDO) mkdir -p /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \
-	&& $(RUN) $(SUDO) cp -a ~/.$* /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \
-	&& $(RUN) $(SUDO) chown -R $(USER) /var/lib/docker/volumes/$(HOSTNAME)_$* \
+	[ ! -d /var/lib/docker/volumes/$(HOSTNAME)_$* ] \
+	&& $(RUN) $(SUDO) mkdir -p /var/lib/docker/volumes/$(HOSTNAME)_$* \
+	&& $(RUN) $(SUDO) cp -a $(if $($*),$($*)/,~/.$*/) /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \
+	&& $(RUN) $(SUDO) chown -R $(HOST_UID):$(HOST_GID) /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \
 	|| :
 
+.PHONY: player
 player: STACK := User
 player: docker-network-create-$(USER)
 	$(call make,stack-User-$(if $(DELETE),down,up),$(MYOS),COMPOSE_PROJECT_NAME MAIL)
 
+.PHONY: player-%
 player-%: STACK := User
 player-%:
 	$(if $(filter $*,$(filter-out %-%,$(patsubst docker-compose-%,%,$(filter docker-compose-%,$(MAKE_TARGETS))))), \
 	  $(call make,stack-User-$*,$(MYOS),COMPOSE_PROJECT_NAME MAIL) \
 	)
 
-tests: shellcheck
-
+.PHONY: shellcheck
 shellcheck:
 	shellcheck $(SHELL_FILES) ||:
 
+.PHONY: shellcheck-%
 shellcheck-%:
 	shellcheck $*/*.sh
+
+.PHONY: tests
+tests: shellcheck
+
+.PHONY: upgrade
+upgrade: migrate-home migrate-ipfs
+	echo "Welcome to myos docker land - make a user - make a player -"
diff --git a/docker/stack.mk b/docker/astroport.mk
similarity index 68%
rename from docker/stack.mk
rename to docker/astroport.mk
index 8e8efa88..2ff187da 100644
--- a/docker/stack.mk
+++ b/docker/astroport.mk
@@ -1,7 +1,10 @@
 COMPOSE_FILE_VDI                          := true
+COMPOSE_IGNORE_ORPHANS                    := true
 DOCKER_IMAGES_MYOS                        := x2go:xfce-debian
 ENV_VARS                                  += HOST_ASTROPORT_SERVICE_1234_TAGS
-HOST_ASTROPORT_SERVICE_1234_TAGS          ?= urlprefix-astroport.$(DOMAIN)/
+HOST_ASTROPORT_SERVICE_URIS               ?= $(patsubst %,astroport.%,$(APP_URIS))
+HOST_ASTROPORT_SERVICE_1234_TAGS          ?= $(call urlprefix,,$(HOST_ASTROPORT_SERVICE_1234_URIS))
+HOST_ASTROPORT_SERVICE_1234_URIS          ?= $(HOST_ASTROPORT_SERVICE_URIS)
 HOST_ASTROPORT_UFW_UPDATE                 := 1234/tcp 12245:12445/tcp 45720/tcp
 MAKE_VARS                                 += SSH_PORT User host
 SERVICE                                   := astroport