fix

.env.dist

@@ -1,9 +0,0 @@
-DOCKER_IMAGES_MYOS=x2go:xfce-debian
-NODE_ASTROPORT_SERVICE_1234_TAGS=urlprefix-astroport.${DOMAIN}/
-NODE_VDI_ECRYPTERS=zen
-NODE_VDI_LANG=${LANG}
-NODE_VDI_PORT=45720
-NODE_VDI_SUDOERS=
-NODE_VDI_TZ=UTC
-NODE_VDI_USERS=zen
-UFW_UPDATE_ASTROPORT=1234 12245:12445/tcp

Makefile

@@ -9,7 +9,7 @@ SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh)
 
 all: install tests
 
-install: myos-node player-build up
+install: myos-node build player-build docker-network-create-$(USER) player up
 
 player: STACK := User
 player:

docker/astroport/Dockerfile

@@ -8,6 +8,7 @@ ARG DOCKER_SYSTEM=Linux
 RUN apt-get update \
  && apt-get -fy upgrade \
  && DEBIAN_FRONTEND=noninteractive apt-get -fy install \
+        basez \
         bash \
         bc \
         cron \

docker/docker-compose.app.yml

@@ -15,9 +15,12 @@ services:
     labels:
     - SERVICE_1234_CHECK_HTTP=/test
     - SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME}-astroport-1234
-    - SERVICE_1234_TAGS=${NODE_ASTROPORT_SERVICE_1234_TAGS}
+    - SERVICE_1234_TAGS=${NODE_ASTROPORT_SERVICE_1234_TAGS:-}
+    volumes:
+    - dns:/dns
 
 volumes:
+  dns:
   ipfs:
     external: true
     name: ${COMPOSE_SERVICE_NAME}_ipfs

docker/docker-compose.vdi.yml

@@ -2,9 +2,6 @@ version: '3.8'
 
 services:
   astroport:
-    build:
-      args:
-      - SSH_PORT=${NODE_VDI_PORT:-22}
     cap_add:
     - IPC_LOCK # ecryptfs
     - NET_ADMIN # iptables
@@ -12,12 +9,20 @@ services:
     - SYS_ADMIN # ecryptfs
     environment:
     - DEBUG=${VDI_DEBUG:-}
-    - ECRYPTERS=${NODE_VDI_ECRYPTERS:-}
+    - ECRYPTERS=${NODE_VDI_ECRYPTERS:-zen}
     - LANG=${NODE_VDI_LANG:-}
+    - RC_00_SOURCE=${USER_RC_SOURCE:-/etc/profile.d/rc_functions.sh}
+    - RC_01_PS1_SET=${USER_RC_PS1_SET:-true}
+    - RC_02_PROMPT_SET=${USER_RC_PROMPT_SET:-true}
+    - RC_03_SSH_ADD=${USER_RC_SSH_ADD:-true}
+    - RC_04_TMUX_ATTACH=${USER_RC_TMUX_ATTACH:-false}
+    - RC_05_SCREEN_ATTACH=${USER_RC_SCREEN_ATTACH:-true}
     - SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-}
-    - SSH_PORT=${NODE_VDI_PORT:-22}
+    - SSH_PORT=${SSH_PORT:-22}
     - SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-}
-    - SUDOERS=${NODE_VDI_SUDOERS:-}
+    - SUDOERS=${NODE_VDI_SUDOERS:-:-${USER}}
+    - TZ=${NODE_VDI_TZ:-:-{TZ}}
+    - USERS=${NODE_VDI_USERS:-zen}
     security_opt:
     - apparmor=unconfined # ecryptfs
     - seccomp=unconfined # ecryptfs
@@ -26,6 +31,7 @@ services:
     - /etc/localtime:/etc/localtime:ro
     - /etc/default/console-setup:/etc/default/console-setup:ro
     - /etc/default/keyboard:/etc/default/keyboard:ro
+    - /var/run/docker.sock:/var/run/docker.sock:ro
     - home:/home:delegated
     - shared:/shared:cached
     - shm:/dev/shm:delegated

docker/stack.mk

@@ -1,9 +1,12 @@
+DOCKER_IMAGES_MYOS              := x2go:xfce-debian
+ENV_VARS                        += NODE_ASTROPORT_SERVICE_1234_TAGS
 COMPOSE_FILE_VDI                := true
-MAKE_VARS                       += NODE_VDI_PORT User node
+MAKE_VARS                       += SSH_PORT User node
+NODE_ASTROPORT_SERVICE_1234_TAGS ?= urlprefix-astroport.$(DOMAIN)/
 SERVICE                         := astroport
-SSH_PORT                        := $(NODE_VDI_PORT)
+SSH_PORT                        := 45720
 SSH_PUBLIC_HOSTS                += git.p2p.legal
 STACK                           := node
-UFW_UPDATE                      := $(SERVICE)
+UFW_UPDATE_ASTROPORT            := 1234/tcp 12245:12445/tcp 45720/tcp
 User                            := User/ipfs
 node                            := node/ipfs