Skip to content
Snippets Groups Projects
Commit 46f58f6a authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixes

parent d6d8ad74
No related branches found
No related tags found
No related merge requests found
...@@ -20,15 +20,15 @@ COPY files/background.jpg /usr/share/images/fluxbox/background.jpg ...@@ -20,15 +20,15 @@ COPY files/background.jpg /usr/share/images/fluxbox/background.jpg
RUN chmod 777 /home RUN chmod 777 /home
# Set entrypoint commands # Set entrypoint commands
COPY files/start_fluxbox.sh / COPY files/start_fluxbox.sh /usr/bin/start_fluxbox.sh
RUN chmod 755 /start_fluxbox.sh RUN chmod 755 /usr/bin/start_fluxbox.sh
ENV X11_ENTRYPOINT_COMMAND="/start_fluxbox.sh" ENV X11_ENTRYPOINT_COMMAND="/usr/bin/start_fluxbox.sh"
# Set user # Set user
USER metauser USER metauser
# Set container name # Set container name
ENV CONTAINER_NAME='MinimalDesktop' ENV CONTAINER_NAME='minimaldesktop'
#!/bin/bash #!/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
...@@ -11,9 +11,9 @@ RUN apt-get install openssh-server -y ...@@ -11,9 +11,9 @@ RUN apt-get install openssh-server -y
RUN echo "metauser:metapass" | chpasswd RUN echo "metauser:metapass" | chpasswd
# Set entrypoint command # Set entrypoint command
COPY files/entrypoint.sh /entrypoint.sh COPY files/entrypoint.sh /usr/bin/entrypoint.sh
RUN chmod 755 /entrypoint.sh RUN chmod 755 /usr/bin/entrypoint.sh
ENV DEFAULT_ENTRYPOINT_COMMAND="/entrypoint.sh" ENV DEFAULT_ENTRYPOINT_COMMAND="/usr/bin/entrypoint.sh"
# Fix home permissions # Fix home permissions
RUN chmod 777 /home RUN chmod 777 /home
...@@ -22,7 +22,7 @@ RUN chmod 777 /home ...@@ -22,7 +22,7 @@ RUN chmod 777 /home
USER metauser USER metauser
# Set container name # Set container name
ENV CONTAINER_NAME='SSH' ENV CONTAINER_NAME='ssh'
...@@ -55,13 +55,13 @@ RUN chmod 755 /opt/tigervnc/xstartup ...@@ -55,13 +55,13 @@ RUN chmod 755 /opt/tigervnc/xstartup
RUN chmod 777 /home RUN chmod 777 /home
# Set entrypoint command # Set entrypoint command
ENV DEFAULT_ENTRYPOINT_COMMAND="supervisord -c /etc/supervisor/supervisord.conf" ENV DEFAULT_ENTRYPOINT_COMMAND="supervisord"
# Set user # Set user
USER metauser USER metauser
# Set container name # Set container name
ENV CONTAINER_NAME='X11Web' ENV CONTAINER_NAME='x11web'
...@@ -14,7 +14,7 @@ RUN chmod 777 /home ...@@ -14,7 +14,7 @@ RUN chmod 777 /home
USER metauser USER metauser
# Set container name # Set container name
ENV CONTAINER_NAME='XCalc' ENV CONTAINER_NAME='xcalc'
...@@ -44,9 +44,9 @@ RUN mv /home/metauser /metauser_home_vanilla ...@@ -44,9 +44,9 @@ RUN mv /home/metauser /metauser_home_vanilla
ENV CONTAINER_NAME='base' ENV CONTAINER_NAME='base'
# Entrypoint # Entrypoint
COPY files/base_entrypoint.sh / COPY files/base_entrypoint.sh /usr/bin/base_entrypoint.sh
RUN chmod 755 /base_entrypoint.sh RUN chmod 755 /usr/bin/base_entrypoint.sh
ENTRYPOINT ["/base_entrypoint.sh"] ENTRYPOINT ["/usr/bin/base_entrypoint.sh"]
ENV DEFAULT_ENTRYPOINT_COMMAND="/bin/bash" ENV DEFAULT_ENTRYPOINT_COMMAND="/bin/bash"
# Allow to move the /home_vanilla folder in /home # Allow to move the /home_vanilla folder in /home
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment