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

make player PLAYER_API_PORT=45721

This commit is contained in:
Yann Autissier 2022-12-20 17:56:22 +00:00
parent ee04301c67
commit 1b422f2956
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -16,7 +16,7 @@ install: myos build player up
echo "Welcome to myos docker land - make a user - make a player -"
.PHONY: migrate
migrate-%: home := ~/.zen/game/players
migrate-%: home := ~/.zen/game/players
migrate-%:
if $(SUDO) test ! -d /var/lib/docker/volumes/$(HOSTNAME)_$*; then \
$(RUN) $(SUDO) mkdir -p /var/lib/docker/volumes/$(HOSTNAME)_$* \
@ -26,15 +26,15 @@ migrate-%:
fi
.PHONY: player
player: STACK := User
player: STACK := 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),$(PLAYER_MAKE_VARS))
.PHONY: player-%
player-%: STACK := User
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) \
$(call make,stack-User-$*,$(MYOS),$(PLAYER_MAKE_VARS)) \
)
.PHONY: shellcheck

14
docker/astroport.mk
View File

@ -3,13 +3,23 @@ COMPOSE_IGNORE_ORPHANS := true
DOCKER_IMAGES_MYOS := x2go:xfce-debian
ENV_VARS += HOST_ASTROPORT_SERVICE_DOMAIN HOST_ASTROPORT_SERVICE_NAME HOST_ASTROPORT_SERVICE_1234_TAGS
HOST_ASTROPORT_SERVICE_DOMAIN ?= $(firstword $(DOMAIN))
HOST_ASTROPORT_SERVICE_NAME ?= $(HOSTNAME)
HOST_ASTROPORT_SERVICE_1234_TAGS ?= $(call tagprefix,astroport)
HOST_ASTROPORT_SERVICE_NAME ?= astroport
HOST_ASTROPORT_SERVICE_1234_TAGS ?= $(call tagprefix,HOST_ASTROPORT,1234)
HOST_ASTROPORT_UFW_UPDATE := 1234/tcp 12245:12445/tcp 45720/tcp
MAKE_VARS += SSH_PORT User host
PLAYER_MAKE_VARS := COMPOSE_PROJECT_NAME MAIL IPFS_UFW_DOCKER IPFS_UFW_UPDATE USER_IPFS_SERVICE_PROXY_TCP USER_IPFS_SERVICE_5001_ENVS USER_PATH_PREFIX
SERVICE := astroport
SSH_PORT := 45720
SSH_PUBLIC_HOSTS := git.p2p.legal
STACK := host
USER_PATH_PREFIX := player/
User := User/ipfs
host := host/ipfs
ifeq ($(PLAYER_API_ONLINE),true)
USER_IPFS_SERVICE_5001_ENVS ?= 5001
else ifneq ($(PLAYER_API_PORT),)
IPFS_UFW_DOCKER += 5001/tcp
IPFS_UFW_UPDATE += $(PLAYER_API_PORT)/tcp
USER_IPFS_SERVICE_PROXY_TCP := :$(PLAYER_API_PORT)
USER_IPFS_SERVICE_5001_ENVS += proxy
endif