Commit 46f58f6a authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixes

parent d6d8ad74
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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'


+1 −1
Original line number Diff line number Diff line
#!/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
+4 −4
Original line number Diff line number Diff line
@@ -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'


+2 −2
Original line number Diff line number Diff line
@@ -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'


+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ RUN chmod 777 /home
USER metauser

# Set container name
ENV CONTAINER_NAME='XCalc'
ENV CONTAINER_NAME='xcalc'


Loading