make player PLAYER_API_PORT=45721
This commit is contained in:
parent
ee04301c67
commit
1b422f2956
10
Makefile
10
Makefile
|
@ -16,7 +16,7 @@ install: myos build player up
|
||||||
echo "Welcome to myos docker land - make a user - make a player -"
|
echo "Welcome to myos docker land - make a user - make a player -"
|
||||||
|
|
||||||
.PHONY: migrate
|
.PHONY: migrate
|
||||||
migrate-%: home := ~/.zen/game/players
|
migrate-%: home := ~/.zen/game/players
|
||||||
migrate-%:
|
migrate-%:
|
||||||
if $(SUDO) test ! -d /var/lib/docker/volumes/$(HOSTNAME)_$*; then \
|
if $(SUDO) test ! -d /var/lib/docker/volumes/$(HOSTNAME)_$*; then \
|
||||||
$(RUN) $(SUDO) mkdir -p /var/lib/docker/volumes/$(HOSTNAME)_$* \
|
$(RUN) $(SUDO) mkdir -p /var/lib/docker/volumes/$(HOSTNAME)_$* \
|
||||||
|
@ -26,15 +26,15 @@ migrate-%:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.PHONY: player
|
.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),$(PLAYER_MAKE_VARS))
|
||||||
|
|
||||||
.PHONY: player-%
|
.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),$(PLAYER_MAKE_VARS)) \
|
||||||
)
|
)
|
||||||
|
|
||||||
.PHONY: shellcheck
|
.PHONY: shellcheck
|
||||||
|
|
|
@ -3,13 +3,23 @@ COMPOSE_IGNORE_ORPHANS := true
|
||||||
DOCKER_IMAGES_MYOS := x2go:xfce-debian
|
DOCKER_IMAGES_MYOS := x2go:xfce-debian
|
||||||
ENV_VARS += HOST_ASTROPORT_SERVICE_DOMAIN HOST_ASTROPORT_SERVICE_NAME HOST_ASTROPORT_SERVICE_1234_TAGS
|
ENV_VARS += HOST_ASTROPORT_SERVICE_DOMAIN HOST_ASTROPORT_SERVICE_NAME HOST_ASTROPORT_SERVICE_1234_TAGS
|
||||||
HOST_ASTROPORT_SERVICE_DOMAIN ?= $(firstword $(DOMAIN))
|
HOST_ASTROPORT_SERVICE_DOMAIN ?= $(firstword $(DOMAIN))
|
||||||
HOST_ASTROPORT_SERVICE_NAME ?= $(HOSTNAME)
|
HOST_ASTROPORT_SERVICE_NAME ?= astroport
|
||||||
HOST_ASTROPORT_SERVICE_1234_TAGS ?= $(call tagprefix,astroport)
|
HOST_ASTROPORT_SERVICE_1234_TAGS ?= $(call tagprefix,HOST_ASTROPORT,1234)
|
||||||
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
|
||||||
|
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
|
SERVICE := astroport
|
||||||
SSH_PORT := 45720
|
SSH_PORT := 45720
|
||||||
SSH_PUBLIC_HOSTS := git.p2p.legal
|
SSH_PUBLIC_HOSTS := git.p2p.legal
|
||||||
STACK := host
|
STACK := host
|
||||||
|
USER_PATH_PREFIX := player/
|
||||||
User := User/ipfs
|
User := User/ipfs
|
||||||
host := host/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
|
||||||
|
|
Loading…
Reference in New Issue