STI/Astroport.ONE
STI
/
Astroport.ONE
4
1
Fork 2
Code Issues 11 Pull Requests Projects Releases 1 Wiki Activity

multi domain HOST_LB=true

This commit is contained in:
Yann Autissier 2022-12-10 13:31:41 +00:00
parent 95ff8d7dec
commit daad060e6c
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@ -4,37 +4,46 @@ MYOS_REPOSITORY ?= https://github.com/aynicos/myos
$(MYOS): $(MYOS):
-@git clone $(MYOS_REPOSITORY) $(MYOS) -@git clone $(MYOS_REPOSITORY) $(MYOS)
.PHONY: all install shellcheck shellcheck-% tests
SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh) SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh)
.PHONY: all
all: install tests all: install tests
install: upgrade build myos-host up player .PHONY: install
install: upgrade build myos up player
upgrade: migrate-ipfs migrate-zen
echo "Welcome to myos docker land - make a user - make a player -"
.PHONY: migrate
migrate-%: home := ~/.zen/game/players
migrate-%: migrate-%:
[ ! -f /var/lib/docker/volumes/$(HOSTNAME)_$*/_data ] \ [ ! -d /var/lib/docker/volumes/$(HOSTNAME)_$* ] \
&& $(RUN) $(SUDO) mkdir -p /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \ && $(RUN) $(SUDO) mkdir -p /var/lib/docker/volumes/$(HOSTNAME)_$* \
&& $(RUN) $(SUDO) cp -a ~/.$* /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \ && $(RUN) $(SUDO) cp -a $(if $($*),$($*)/,~/.$*/) /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \
&& $(RUN) $(SUDO) chown -R $(USER) /var/lib/docker/volumes/$(HOSTNAME)_$* \ && $(RUN) $(SUDO) chown -R $(HOST_UID):$(HOST_GID) /var/lib/docker/volumes/$(HOSTNAME)_$*/_data \
|| : || :
.PHONY: player
player: STACK := User player: STACK := User
player: docker-network-create-$(USER) player: docker-network-create-$(USER)
$(call make,stack-User-$(if $(DELETE),down,up),$(MYOS),COMPOSE_PROJECT_NAME MAIL) $(call make,stack-User-$(if $(DELETE),down,up),$(MYOS),COMPOSE_PROJECT_NAME MAIL)
.PHONY: player-%
player-%: STACK := User player-%: STACK := User
player-%: player-%:
$(if $(filter $*,$(filter-out %-%,$(patsubst docker-compose-%,%,$(filter docker-compose-%,$(MAKE_TARGETS))))), \ $(if $(filter $*,$(filter-out %-%,$(patsubst docker-compose-%,%,$(filter docker-compose-%,$(MAKE_TARGETS))))), \
$(call make,stack-User-$*,$(MYOS),COMPOSE_PROJECT_NAME MAIL) \ $(call make,stack-User-$*,$(MYOS),COMPOSE_PROJECT_NAME MAIL) \
) )
tests: shellcheck .PHONY: shellcheck
shellcheck: shellcheck:
shellcheck $(SHELL_FILES) ||: shellcheck $(SHELL_FILES) ||:
.PHONY: shellcheck-%
shellcheck-%: shellcheck-%:
shellcheck $*/*.sh 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 -"

5
docker/stack.mk → docker/astroport.mk
View File

@ -1,7 +1,10 @@
COMPOSE_FILE_VDI := true COMPOSE_FILE_VDI := true
COMPOSE_IGNORE_ORPHANS := true
DOCKER_IMAGES_MYOS := x2go:xfce-debian DOCKER_IMAGES_MYOS := x2go:xfce-debian
ENV_VARS += HOST_ASTROPORT_SERVICE_1234_TAGS 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 HOST_ASTROPORT_UFW_UPDATE := 1234/tcp 12245:12445/tcp 45720/tcp
MAKE_VARS += SSH_PORT User host MAKE_VARS += SSH_PORT User host
SERVICE := astroport SERVICE := astroport