From 874eca9a4cf5ebdba608e1d66eeb344b4040d11b Mon Sep 17 00:00:00 2001
From: Thomas <thomas.briffard@gmail.com>
Date: Sat, 25 Jan 2020 16:24:02 -0500
Subject: [PATCH] corrections

---
 docker-compose.yml   |  7 ++++---
 docker-entrypoint.sh |  8 +++++---
 wrapper.sh           | 11 ++++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a851884..c5b7bab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,10 +24,11 @@ services:
       - ~/.ssh:/home/.ssh:ro
     init: true
     environment:
-      - ANYCONNECT_SERVER=${ANYCONNECT_SERVER}
-      - ANYCONNECT_USER=${ANYCONNECT_USER}
-      - ANYCONNECT_PASSWORD=${ANYCONNECT_SERVER}
+      - ANYCONNECT_SERVER=${VPN_SERVER}
+      - ANYCONNECT_USER=${VPN_USER}
+      - ANYCONNECT_PASSWORD=${VPN_PASSWORD}
       - USER_ID=${USER_ID}
+      - GROUPE_ID=${GROUPE_ID}
     networks:
       - default
     cap_add:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index c9db81d..95252c0 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -7,9 +7,11 @@ id_node=$(id -u node)
 
 if [ $id_node != ${USER_ID} ]; then
 	echo "Création de l'utilisateur giref avec uid=${USER_ID}"
-	uname=giref
-	uid=${USER_ID}
-	adduser -u $uid -h /home/giref/ -s /bin/bash -D giref;
+	if [ -z ${GROUPE_ID} ]; then
+	    adduser -u ${USER_ID} -h /home/giref/ -s /bin/bash -D giref;
+	else
+	    adduser -u ${GROUPE_ID} -g ${GROUPE_ID} -h /home/giref/ -s /bin/bash -D giref;
+	fi
 	user=giref
 else
 	user=node
diff --git a/wrapper.sh b/wrapper.sh
index f8b9941..b2885ab 100755
--- a/wrapper.sh
+++ b/wrapper.sh
@@ -7,18 +7,19 @@ export GIREF_HOSTNAME=votre_machine
 export VOLUME=le_dossier_a_monter
 export ANYCONNECT_USER=votre_idul
 export USER_ID=id_user_giref
+export GROUPE_ID=id_groupe
 ##########################################
 
 
 # Ne pas éditer le reste 
 export ANYCONNECT_SERVER=vpn.ulaval.ca
 if [ "$1" == "up" ]; then
-	echo -n "Veuillez rentrer votre mot de passe pour ${ANYCONNECT_SERVER} :"
-	read -s $password
-	echo
-	export ANYCONNECT_PASSWORD=$password
+	echo "Veuillez rentrer votre mot de passe pour ${VPN_SERVER} :"
+	read -s password
+	export VPN_PASSWORD=$password
+	echo "Mot de passe ${VPN_PASSWORD}"
 	docker-compose up -d
-	echo "Vous pouvez vous connecter à http://${GIREF_HOSTNAME}/theia/"
+	echo -e "Vous pouvez vous connecter à \e[94mhttp://${GIREF_HOSTNAME}/theia/\e[39m (Attention, le / à la fin est important)"
 elif [ "$1" == "down" ]; then
 	echo "Arrêt de theia..."
 	docker-compose down