Moved from /metauser home to /home/metauser. Minor fixes. (9814ea24) · Commits · ExaCT / SWC

BasicMetaDesktop/Dockerfile

+12 −12

Original line number	Diff line number	Diff line
		@@ -37,41 +37,41 @@ RUN chmod 755 /opt/tigervnc/xstartup
		RUN apt-get install imwheel zenity x11-xserver-utils -y

		# Create the Desktop
		RUN mkdir /metauser_vanilla/Desktop && chown metauser:metauser /metauser_vanilla/Desktop
		RUN mkdir /metauser_home_vanilla/Desktop && chown metauser:metauser /metauser_home_vanilla/Desktop

		# Add mouse scrolling script
		COPY files/set_mouse_scrolling_speed /usr/bin/
		COPY files/Set_Mouse_Scrolling_Speed.desktop /metauser_vanilla/Desktop/
		COPY files/Set_Mouse_Scrolling_Speed.desktop /metauser_home_vanilla/Desktop/
		RUN chmod 755 /usr/bin/set_mouse_scrolling_speed

		# Add Display Resolution stuff
		#COPY add_display_resolution /usr/bin/
		#COPY add_display_resolution_gui /usr/bin/
		#COPY Set_Display_Resolution.desktop /metauser_vanilla/Desktop/
		#COPY Add_Display_Resolution.desktop /metauser_vanilla/Desktop/
		#COPY Set_Display_Resolution.desktop /metauser_home_vanilla/Desktop/
		#COPY Add_Display_Resolution.desktop /metauser_home_vanilla/Desktop/
		#RUN chmod 755 /usr/bin/add_display_resolution && chmod 755 /usr/bin/add_display_resolution_gui

		# Correct ownership of Desktop shortcuts
		RUN chown -R metauser:metauser /metauser_vanilla/Desktop/
		RUN chown -R metauser:metauser /metauser_home_vanilla/Desktop/

		# Shorter bash prompt
		#RUN echo "PS1=\"\u@MetaBox:\W $ \"" >> /metauser_vanilla/.bashrc
		#RUN echo "PS1=\"\u@MetaBox:\W $ \"" >> /metauser_home_vanilla/.bashrc


		# Default conf (mostly eyecandy)
		COPY files/home_metauser_.config /metauser_vanilla/.config
		#COPY data/desktop-cf881dd7/metauser_vanilla/.config /metauser_vanilla/.config
		RUN chown -R metauser:metauser /metauser_vanilla/.config
		COPY files/home_metauser_.config /metauser_home_vanilla/.config
		#COPY data/desktop-cf881dd7/metauser_home_vanilla/.config /metauser_home_vanilla/.config
		RUN chown -R metauser:metauser /metauser_home_vanilla/.config

		# Disable screensaver
		COPY files/dot_xscreensaver /metauser_vanilla/.xscreensaver
		RUN chown metauser:metauser /metauser_vanilla/.xscreensaver
		COPY files/dot_xscreensaver /metauser_home_vanilla/.xscreensaver
		RUN chown metauser:metauser /metauser_home_vanilla/.xscreensaver

		# Disable logout dialog
		RUN chmod 000 /usr/bin/xfce4-session-logout

		# Create Downloads folder. This is "required" for showing proper spacing between icons in the filemanager a bounch
		RUN mkdir /metauser_vanilla/Downloads && chown metauser:metauser /metauser_vanilla/Downloads
		RUN mkdir /metauser_home_vanilla/Downloads && chown metauser:metauser /metauser_home_vanilla/Downloads


		#----------------------

BasicMetaDesktop/files/runshell.sh

+1 −1

Original line number	Diff line number	Diff line
		#!/bin/bash
		cd /metauser
		cd /home/metauser
		exec /bin/bash

DevMetaDesktop/Dockerfile

+3 −3

Original line number	Diff line number	Diff line
		@@ -30,11 +30,11 @@ COPY files/PyDev_3.4.1.zip /tmp
		RUN cd eclipse/dropins/ && unzip /tmp/PyDev_3.4.1.zip
		RUN mv eclipse /opt/
		COPY files/eclipse128.png /opt/eclipse/eclipse128.png
		COPY files/Eclipse.desktop /metauser_vanilla/Desktop/
		RUN chown -R metauser:metauser /metauser_vanilla/Desktop/
		COPY files/Eclipse.desktop /metauser_home_vanilla/Desktop/
		RUN chown -R metauser:metauser /metauser_home_vanilla/Desktop/

		# Set terminals interrupt shortcut to ctrl-x
		#RUN echo "stty intr ^x" >> /metauser_vanilla/.bashrc
		#RUN echo "stty intr ^x" >> /metauser_home_vanilla/.bashrc

		# Enable Inet for ssh X forwarding
		#RUN echo "AddressFamily inet" >> /etc/ssh/sshd_config

MinimalMetaDesktop/Dockerfile

+9 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ RUN apt-get install -y nano telnet unzip wget supervisor build-essential python-
		RUN groupadd -g 65527 metauser

		# Add user. We chose UID 65527 to try avoiding conflicts.
		RUN useradd metauser -d /metauser -u 65527 -g 65527 -m -s /bin/bash
		RUN useradd metauser -d /home/metauser -u 65527 -g 65527 -m -s /bin/bash

		# Add metuaser user to sudoers
		RUN adduser metauser sudo
		@@ -78,16 +78,20 @@ COPY files/xstartup /opt/tigervnc/
		RUN chmod 755 /opt/tigervnc/xstartup

		# Prepare for logs
		RUN mkdir /metauser/logs && chown metauser:metauser /metauser/logs
		RUN mkdir /home/metauser/.logs && chown metauser:metauser /home/metauser/.logs

		# Rename metauser home folder as a "vanilla" home folder
		RUN mv /metauser /metauser_vanilla
		RUN mv /home/metauser /metauser_home_vanilla

		# Add fluxbox customisations
		COPY files/dot_fluxbox /metauser_vanilla/.fluxbox
		RUN chown -R metauser:metauser /metauser_vanilla/.fluxbox
		COPY files/dot_fluxbox /metauser_home_vanilla/.fluxbox
		RUN chown -R metauser:metauser /metauser_home_vanilla/.fluxbox
		COPY files/background.jpg /usr/share/images/fluxbox/background.jpg

		# Give write access to anyone to the home folder so the entrypoint will be able
		# to copy over the /home/matauser_vanilla into /home/metause (for Singularity)
		RUN chmod 777 /home


		#----------------------
		# Entrypoint

MinimalMetaDesktop/files/dot_fluxbox/init

+4 −4

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ session.screen0.windowPlacement: RowMinOverlapPlacement
		session.screen0.focusNewWindows: true
		session.screen0.clickRaises: true
		session.screen0.maxDisableResize: false
		session.screen0.windowMenu: /metauser/.fluxbox/windowmenu
		session.screen0.windowMenu: /home/metauser/.fluxbox/windowmenu
		session.screen0.allowRemoteActions: false
		session.screen0.strftimeFormat: %d %b, %a %02k:%M:%S
		session.screen0.focusSameHead: false
		@@ -58,18 +58,18 @@ session.screen0.focusModel: ClickFocus
		session.screen0.showwindowposition: false
		session.screen0.maxIgnoreIncrement: true
		session.screen0.workspaces: 1
		session.styleOverlay: /metauser/.fluxbox/overlay
		session.styleOverlay: /home/metauser/.fluxbox/overlay
		session.keyFile: ~/.fluxbox/keys
		session.cacheMax: 200
		session.tabsAttachArea: Window
		session.slitlistFile: /metauser/.fluxbox/slitlist
		session.slitlistFile: /home/metauser/.fluxbox/slitlist
		session.forcePseudoTransparency: false
		session.tabPadding: 0
		session.colorsPerChannel: 4
		session.styleFile: /usr/share/fluxbox/styles//ubuntu-light
		session.autoRaiseDelay: 250
		session.cacheLife: 5
		session.appsFile: /metauser/.fluxbox/apps
		session.appsFile: /home/metauser/.fluxbox/apps
		session.ignoreBorder: false
		session.configVersion: 13
		session.doubleClickInterval: 250