node is hostname

stack/node/.env.dist

@@ -2,6 +2,8 @@ NODE_CONSUL_ACL_TOKENS_MASTER=01234567-89AB-CDEF-0123-456789ABCDEF
 NODE_CONSUL_HTTP_TOKEN=01234567-89AB-CDEF-0123-456789ABCDEF
 NODE_CONSUL_SERVICE_8500_TAGS=urlprefix-consul.${DOMAIN}/
 NODE_FABIO_SERVICE_9998_TAGS=urlprefix-fabio.${DOMAIN}/
-UFW_UPDATE_node-certbot=53/udp
-UFW_UPDATE_node-consul=8500
-UFW_DOCKER_node-fabio=80 443
+NODE_SSH_PORT=${SSH_PORT}
+NODE_SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS}
+UFW_UPDATE_certbot=53/udp
+UFW_UPDATE_consul=8500
+UFW_DOCKER_fabio=80 443

stack/node/ipfs/.env.dist

@@ -16,4 +16,4 @@ NODE_IPFS_API_HTTPHEADERS_ACA_CREDENTIALS=["true"]
 NODE_IPFS_API_HTTPHEADERS_ACA_HEADERS=["X-Requested-With", "Range", "User-Agent"]
 NODE_IPFS_API_HTTPHEADERS_ACA_METHODS=["OPTIONS", "POST"]
 NODE_IPFS_API_HTTPHEADERS_ACA_ORIGIN=["https://ipfs.${DOMAIN}", "http://ipfs.${DOMAIN}", "http://ipfs.localhost:8080"]
-UFW_DOCKER_node-ipfs=4001/tcp 4001/udp 8080
+UFW_DOCKER_ipfs=4001/tcp 4001/udp 8080

stack/node/ipfs/ipfs.yml

@@ -5,7 +5,9 @@ services:
     build:
       args:
       - DOCKER_BUILD_DIR=docker/ipfs
+      - GID=${NODE_GID}
       - IPFS_VERSION=${IPFS_VERSION}
+      - UID=${NODE_UID}
       context: ../..
       dockerfile: docker/ipfs/Dockerfile
     command: daemon --agent-version-suffix=${NODE_COMPOSE_PROJECT_NAME} ${NODE_IPFS_DAEMON_ARGS}

stack/node/mail/.env.dist

@@ -2,4 +2,4 @@ NODE_MAILSERVER_ENABLE_MANAGESIEVE=1
 NODE_MAILSERVER_SPOOF_PROTECTION=1
 NODE_MAILSERVER_SSL_TYPE=letsencrypt
 NODE_MAILSERVER_UPDATE_CHECK=0
-UFW_DOCKER_node-mailserver=25 465 587 993
+UFW_DOCKER_mailserver=25 465 587 993

stack/node/vdi/.env.dist

@@ -0,0 +1,7 @@
+NODE_VDI_ECRYPTERS=${USER}
+NODE_VDI_LANG=${LANG}
+NODE_VDI_PORT=${SSH_PORT}
+NODE_VDI_SUDOERS=
+NODE_VDI_TZ=UTC
+NODE_VDI_USERS=${USER}
+UFW_DOCKER_vdi=${SSH_PORT}

stack/node/vdi/vdi.yml

@@ -0,0 +1,61 @@
+version: '3.8'
+
+services:
+  vdi:
+    build:
+      args:
+      - DOCKER_BUILD_DIR=docker/x2go/xfce-debian
+      - SSH_PORT=${NODE_VDI_PORT:-22}
+      context: ../..
+      dockerfile: docker/x2go/xfce-debian/Dockerfile
+    cap_add:
+    - IPC_LOCK # ecryptfs
+    - NET_ADMIN # iptables
+    - NET_RAW # iptables
+    - SYS_ADMIN # ecryptfs
+    container_name: ${NODE_COMPOSE_PROJECT_NAME}-vdi
+    cpus: 0.5
+    environment:
+    - DEBUG=${VDI_DEBUG:-}
+    - ECRYPTERS=${NODE_VDI_ECRYPTERS:-}
+    - LANG=${NODE_VDI_LANG:-}
+    - SSH_PORT=${NODE_VDI_PORT:-22}
+    - SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-}
+    - SSH_PUBLIC_HOSTS=${NODE_SSH_PUBLIC_HOSTS:-}
+    - SUDOERS=${NODE_VDI_SUDOERS:-}
+    - TZ=${NODE_VDI_TZ:-}
+    - USERS=${NODE_VDI_USERS:-}
+    image: ${NODE_DOCKER_REPOSITORY}/vdi:${DOCKER_IMAGE_TAG}
+    networks:
+    - public
+    ports:
+    - ${NODE_VDI_PORT:-22}:${SSH_PORT:-22}
+    restart: unless-stopped
+    security_opt:
+    - apparmor=unconfined # ecryptfs
+    - seccomp=unconfined # ecryptfs
+    tty: true
+    volumes:
+    - home:/home:delegated
+    - shared:/shared:cached
+    - shm:/dev/shm:delegated
+
+networks:
+  public:
+    external: true
+    name: ${DOCKER_NETWORK_PUBLIC}
+
+volumes:
+  home:
+  shared:
+    driver: local
+    driver_opts:
+      type: none
+      device: /mnt/shared
+      o: bind
+  shm:
+    driver: local
+    driver_opts:
+      type: tmpfs
+      device: tmpfs
+      o: mode=1777,size=2147483648 # 2GB

stack/x2go/.env.dist

@@ -1,5 +1,6 @@
+VDI_ECRYPTERS=
 VDI_LANG=${LANG}
-VDI_PORT=22
+VDI_PORT=8260
+VDI_SUDOERS=
 VDI_TZ=UTC
 VDI_USERS=${USER}
-VDI_SUDOERS=

stack/x2go/xfce_debian.yml

@@ -5,6 +5,7 @@ services:
     build:
       args:
       - DOCKER_BUILD_DIR=docker/x2go/xfce-debian
+      - SSH_PORT=${VDI_PORT:-22}
       context: ../..
       dockerfile: docker/x2go/xfce-debian/Dockerfile
     cap_add:
@@ -12,15 +13,22 @@ services:
     - NET_ADMIN # iptables
     - NET_RAW # iptables
     - SYS_ADMIN # ecryptfs
+    cpus: 0.5
     environment:
-    - DEBUG=${VDI_DEBUG}
-    - ECRYPTERS=${VDI_ECRYPTERS}
-    - LANG=${VDI_LANG}
-    - SUDOERS=${VDI_SUDOERS}
-    - TZ=${VDI_TZ}
-    - USERS=${VDI_USERS}
+    - DEBUG=${VDI_DEBUG:-}
+    - ECRYPTERS=${VDI_ECRYPTERS:-}
+    - LANG=${VDI_LANG:-}
+    - SSH_PORT=${VDI_PORT:-22}
+    - SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-}
+    - SUDOERS=${VDI_SUDOERS:-}
+    - TZ=${VDI_TZ:-}
+    - USERS=${VDI_USERS:-}
+    image: ${DOCKER_REPOSITORY}/vdi:${DOCKER_IMAGE_TAG}
+    networks:
+    - private
+    - public
     ports:
-    - "${VDI_PORT}:22"
+    - ${SSH_PORT}
     restart: unless-stopped
     security_opt:
     - apparmor=unconfined # ecryptfs
@@ -31,6 +39,14 @@ services:
     - vdi-shared:/shared:cached
     - vdi-shm:/dev/shm:delegated
 
+networks:
+  private:
+    external: true
+    name: ${DOCKER_NETWORK_PRIVATE}
+  public:
+    external: true
+    name: ${DOCKER_NETWORK_PUBLIC}
+
 volumes:
   vdi-home:
   vdi-shared: