From bc0c5d477bcab4873e0b858676cfedc59b62e58c Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Sat, 10 Dec 2022 17:14:30 +0000
Subject: [PATCH] make install

---
 Makefile                      | 10 ++++++----
 docker/astroport/Dockerfile   |  2 +-
 docker/astroport/astroport.sh |  3 ++-
 docker/docker-compose.yml     |  2 --
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4476452b..ddcbd388 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
-MYOS                            ?= ../myos
-MYOS_REPOSITORY                 ?= https://github.com/aynicos/myos
+MYOS                                      ?= ../myos
+MYOS_REPOSITORY                           ?= $(patsubst %/$(APP),%/myos,$(APP_REPOSITORY))
+APP                                       ?= $(lastword $(subst /, ,$(APP_REPOSITORY)))
+APP_REPOSITORY                            ?= $(shell git config --get remote.origin.url 2>/dev/null)
 -include $(MYOS)/make/include.mk
 $(MYOS):
 	-@git clone $(MYOS_REPOSITORY) $(MYOS)
@@ -10,7 +12,8 @@ SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh)
 all: install tests
 
 .PHONY: install
-install: build myos up player
+install: myos build up player
+	echo "Welcome to myos docker land - make a user - make a player -"
 
 .PHONY: migrate
 migrate-%: home := ~/.zen/game/players
@@ -47,4 +50,3 @@ tests: shellcheck
 
 .PHONY: upgrade
 upgrade: migrate-home migrate-ipfs install
-	echo "Welcome to myos docker land - make a user - make a player -"
diff --git a/docker/astroport/Dockerfile b/docker/astroport/Dockerfile
index b9e901ea..ef0f8817 100644
--- a/docker/astroport/Dockerfile
+++ b/docker/astroport/Dockerfile
@@ -191,7 +191,7 @@ VOLUME "/home/$USER/Astroport"
 
 # homedir
 RUN mkdir -p "/home/$USER/.ipfs" "/home/$USER/.zen/game/players" "/home/$USER/Astroport" \
- && chown "$USER" "/home/$USER/.ipfs" "/home/$USER/.zen/game/players" "/home/$USER/Astroport"
+ && chown -R "$USER" "/home/$USER"
 
 HEALTHCHECK CMD [ $(ps aux |grep 'nc -l -p' |wc -l) -lt 199 ] && echo -n OK
 
diff --git a/docker/astroport/astroport.sh b/docker/astroport/astroport.sh
index cfefb863..ab055ba9 100755
--- a/docker/astroport/astroport.sh
+++ b/docker/astroport/astroport.sh
@@ -14,8 +14,9 @@ log() {
 }
 
 zen() {
+  mkdir -p /home/zen/Astroport
+  sudo chown zen:users /home/zen /home/zen/.zen /home/zen/.zen/game /home/zen/.zen/game/players
   [ -d "$ASTROPORT_DIR" ] && cd "$ASTROPORT_DIR" && git pull -q || git clone -q "$ASTROPORT_REPO" "$ASTROPORT_DIR"
-  sudo chown zen /home/zen/.zen/game/players
 }
 
 case "${1:-${cmd:-start}}" in
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fba3bd77..88f8643b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,12 +12,10 @@ services:
     restart: unless-stopped
     tty: true
     volumes:
-    - data:/home/zen/Astroport:cached
     - home:/home/zen/.zen/game/players:delegated
     - ipfs:/home/zen/.ipfs:cached,ro
     working_dir: /home/zen
 
 volumes:
-  data:
   home:
   ipfs: