From 779a823456da0cfe1b40a2fc7586b9ddef71d3e8 Mon Sep 17 00:00:00 2001
From: Boris <git@borispaing.fr>
Date: Sun, 27 Nov 2022 16:13:14 +0100
Subject: [PATCH] bobo's fix

---
 .env.dist                      |  2 ++
 Makefile                       |  4 ++--
 docker/astroport/.bash_aliases | 32 ++++++++++++++++++++++++++++++++
 docker/astroport/Dockerfile    |  1 +
 docker/docker-compose.vdi.yml  |  2 +-
 5 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 .env.dist
 create mode 100644 docker/astroport/.bash_aliases

diff --git a/.env.dist b/.env.dist
new file mode 100644
index 00000000..e940ef0c
--- /dev/null
+++ b/.env.dist
@@ -0,0 +1,2 @@
+DOCKER_COMPOSE_VDI=true
+DOMAIN=localhost
diff --git a/Makefile b/Makefile
index 194e5ba9..baa7dbaf 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,10 @@ SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh)
 
 all: install tests
 
-install: myos-node build player-build docker-network-create-$(USER) player up
+install: build myos-node up player
 
 player: STACK := User
-player:
+player: docker-network-create-$(USER)
 	$(call make,stack-User-$(if $(DELETE),down,up),$(MYOS),COMPOSE_PROJECT_NAME MAIL)
 
 player-%: STACK := User
diff --git a/docker/astroport/.bash_aliases b/docker/astroport/.bash_aliases
new file mode 100644
index 00000000..a661a69b
--- /dev/null
+++ b/docker/astroport/.bash_aliases
@@ -0,0 +1,32 @@
+alias Marge='git merge'
+alias gif='gif diff'
+alias chicken='git checkout'
+alias vala='cd'
+alias Guy_te_fait_chier='git fetch'
+alias poule='git pull'
+alias poussez='git push'
+alias pousseez='git push'
+alias pousseeez='git push'
+alias pousseeeez='git push'
+alias pousseeeeez='git push'
+alias pousseeeeeez='git push'
+alias pousseeeeeeez='git push'
+alias pousseeeeeeeez='git push'
+alias pousseeeeeeeeez='git push'
+alias pousseeeeeeeeeez='git push'
+alias pousseeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeeeeeeeez='git push'
+alias pousseeeeeeeeeeeeeeeeeeeeeeeeez='git push'
+
diff --git a/docker/astroport/Dockerfile b/docker/astroport/Dockerfile
index adc72651..50d1faa7 100644
--- a/docker/astroport/Dockerfile
+++ b/docker/astroport/Dockerfile
@@ -127,6 +127,7 @@ EXPOSE 1234 12345
 
 COPY install.sh /install.sh
 COPY ${DOCKER_BUILD_DIR}/*.sh /app/
+COPY ${DOCKER_BUILD_DIR}/.*aliases /etc/skel/
 CMD ["/app/astroport.sh", "start"]
 
 FROM dist as master
diff --git a/docker/docker-compose.vdi.yml b/docker/docker-compose.vdi.yml
index 0ec7268f..b4120f48 100644
--- a/docker/docker-compose.vdi.yml
+++ b/docker/docker-compose.vdi.yml
@@ -20,7 +20,7 @@ services:
     - SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-}
     - SSH_PORT=${SSH_PORT:-22}
     - SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-}
-    - SUDOERS=${NODE_VDI_SUDOERS:-:-${USER}}
+    - SUDOERS=${NODE_VDI_SUDOERS:-zen}
     - TZ=${NODE_VDI_TZ:-:-{TZ}}
     - USERS=${NODE_VDI_USERS:-zen}
     security_opt: