From 819e330bb1b99d0e22b2264a7956907021d68294 Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Fri, 25 Nov 2022 05:00:22 +0000 Subject: [PATCH] make player --- Makefile | 11 ++++++++++- README.md | 6 ++++++ docker/docker-compose.vdi.yml | 5 ----- docker/stack.mk | 7 ++----- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d7f7c179..99b1a537 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,17 @@ SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh) all: install tests +install: myos-node player-build up + +player: STACK := User player: - $(call make,stack-ipfs-$(if $(DELETE),down,up) USER=$(PLAYER),$(MYOS),IPFS_IDENTITY_PEERID IPFS_IDENTITY_PRIVKEY) + $(call make,stack-User-$(if $(DELETE),down,up),$(MYOS),COMPOSE_PROJECT_NAME MAIL) + +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 diff --git a/README.md b/README.md index 749bf05d..7a8cb51b 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,12 @@ Lancement API (1234) et MAP (12345) Trouvez le moyen d'accéder à votre "Station Astroport" en explorant les environs du premier de ce nom. +# INSTALLATION (Docker) + +``` +make install +``` + # USAGE Selon le modèle de votre TW, diff --git a/docker/docker-compose.vdi.yml b/docker/docker-compose.vdi.yml index 6e4edd7e..4003a9c9 100644 --- a/docker/docker-compose.vdi.yml +++ b/docker/docker-compose.vdi.yml @@ -33,11 +33,6 @@ services: volumes: home: shared: - driver: local - driver_opts: - type: none - device: /mnt/shared - o: bind shm: driver: local driver_opts: diff --git a/docker/stack.mk b/docker/stack.mk index 562ff124..47e9078e 100644 --- a/docker/stack.mk +++ b/docker/stack.mk @@ -1,12 +1,9 @@ COMPOSE_FILE_VDI := true -COMPOSE_PROJECT_NAME := $(HOSTNAME) -MAKE_VARS += NODE_VDI_PORT node +MAKE_VARS += NODE_VDI_PORT User node SERVICE := astroport SSH_PORT := $(NODE_VDI_PORT) SSH_PUBLIC_HOSTS += git.p2p.legal STACK := node UFW_UPDATE := $(SERVICE) +User := User/ipfs node := node/ipfs - -bootstrap-stack: myos-node -