From 46f58f6a69820e216644b56ab197ea08eeb30fd7 Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Fri, 5 Nov 2021 00:20:28 +0100
Subject: [PATCH] Fixes

---
 MinimalDesktop/Dockerfile | 8 ++++----
 MinimalDesktop/run.sh     | 2 +-
 SSH/Dockerfile            | 8 ++++----
 X11Web/Dockerfile         | 4 ++--
 XCalc/Dockerfile          | 2 +-
 base/Dockerfile           | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/MinimalDesktop/Dockerfile b/MinimalDesktop/Dockerfile
index ae4cc3c..b35d310 100644
--- a/MinimalDesktop/Dockerfile
+++ b/MinimalDesktop/Dockerfile
@@ -20,15 +20,15 @@ COPY files/background.jpg /usr/share/images/fluxbox/background.jpg
 RUN chmod 777 /home
 
 # Set entrypoint commands
-COPY files/start_fluxbox.sh /
-RUN chmod 755 /start_fluxbox.sh
-ENV X11_ENTRYPOINT_COMMAND="/start_fluxbox.sh"
+COPY files/start_fluxbox.sh /usr/bin/start_fluxbox.sh
+RUN chmod 755 /usr/bin/start_fluxbox.sh
+ENV X11_ENTRYPOINT_COMMAND="/usr/bin/start_fluxbox.sh"
 
 # Set user
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='MinimalDesktop'
+ENV CONTAINER_NAME='minimaldesktop'
 
 
 
diff --git a/MinimalDesktop/run.sh b/MinimalDesktop/run.sh
index 54be122..456d444 100755
--- a/MinimalDesktop/run.sh
+++ b/MinimalDesktop/run.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -v$PWD/:/data -p8590:8590 -eBASE_PORT=8590 -eAAUTH_PASS=testpass -it minimaldesktop
+docker run -v$PWD/:/data -p8590:8590 -eBASE_PORT=8590 -eAUTH_PASS=testpass -it minimaldesktop
diff --git a/SSH/Dockerfile b/SSH/Dockerfile
index 29b43f0..0107445 100644
--- a/SSH/Dockerfile
+++ b/SSH/Dockerfile
@@ -11,9 +11,9 @@ RUN apt-get install openssh-server  -y
 RUN echo "metauser:metapass" | chpasswd
 
 # Set entrypoint command
-COPY files/entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-ENV DEFAULT_ENTRYPOINT_COMMAND="/entrypoint.sh"
+COPY files/entrypoint.sh /usr/bin/entrypoint.sh
+RUN chmod 755 /usr/bin/entrypoint.sh
+ENV DEFAULT_ENTRYPOINT_COMMAND="/usr/bin/entrypoint.sh"
 
 # Fix home permissions
 RUN chmod 777 /home
@@ -22,7 +22,7 @@ RUN chmod 777 /home
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='SSH'
+ENV CONTAINER_NAME='ssh'
 
 
 
diff --git a/X11Web/Dockerfile b/X11Web/Dockerfile
index 22c0bfb..95d75bb 100644
--- a/X11Web/Dockerfile
+++ b/X11Web/Dockerfile
@@ -55,13 +55,13 @@ RUN chmod 755 /opt/tigervnc/xstartup
 RUN chmod 777 /home
 
 # Set entrypoint command
-ENV DEFAULT_ENTRYPOINT_COMMAND="supervisord -c /etc/supervisor/supervisord.conf"
+ENV DEFAULT_ENTRYPOINT_COMMAND="supervisord"
 
 # Set user
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='X11Web'
+ENV CONTAINER_NAME='x11web'
 
 
 
diff --git a/XCalc/Dockerfile b/XCalc/Dockerfile
index ff133c6..181b33d 100644
--- a/XCalc/Dockerfile
+++ b/XCalc/Dockerfile
@@ -14,7 +14,7 @@ RUN chmod 777 /home
 USER metauser
 
 # Set container name
-ENV CONTAINER_NAME='XCalc'
+ENV CONTAINER_NAME='xcalc'
 
 
 
diff --git a/base/Dockerfile b/base/Dockerfile
index b0612b6..f79ffb4 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -44,9 +44,9 @@ RUN mv /home/metauser /metauser_home_vanilla
 ENV CONTAINER_NAME='base'
 
 # Entrypoint
-COPY files/base_entrypoint.sh /
-RUN chmod 755 /base_entrypoint.sh
-ENTRYPOINT ["/base_entrypoint.sh"]
+COPY files/base_entrypoint.sh /usr/bin/base_entrypoint.sh
+RUN chmod 755 /usr/bin/base_entrypoint.sh
+ENTRYPOINT ["/usr/bin/base_entrypoint.sh"]
 ENV DEFAULT_ENTRYPOINT_COMMAND="/bin/bash"
 
 # Allow to move the /home_vanilla folder in /home
-- 
GitLab