Version 0.3.0

rogaha · rogaha · commit 766f88a18518 · 2013-07-18T22:43:11.000-07:00
+ Funcionality: Allow users to configure the screen resolution
+ Funcionality: Allow users to create multi-sessions
* X Screen: Xpra + Xephyr
+ X Window Manager: Fluxbox
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.0 (2013-07-18)
+ + Funcionality: Allow users to configure the screen resolution 
+ + Funcionality: Allow users to create multi-sessions 
+ * X Screen: Xpra + Xephyr 
+ + X Window Manager: Fluxbox
+
 ## 0.2.0 (2013-07-10)
  + Funcionality: Allow user's disconnection and reconnection without disrupting the session and its application's status  
  + Funcionality: Applications are rootless (It appears on your desktop as normal windows managed by your window manager)
diff --git a/Dockerfile b/Dockerfile
@@ -7,14 +7,14 @@
 # container such as Firefox, LibreOffice, xterm, etc. 
 # with disconnection and reconnection capabilities
 #
-# The applications are rootless, therefore the client machine 
-# manages the windows displayed.
-# 
-# ROX-Filer creates a very minimalist way to manage 
-# files and icons on the desktop. 
+# Xephyr allows to display the programs running inside of the
+# container such as Firefox, LibreOffice, xterm, etc. 
+#
+# Fluxbox and ROX-Filer creates a very minimalist way to 
+# manages the windows and files.
 #
 # Author: Roberto Gandolfo Hashioka
-# Date: 07/10/2013
+# Date: 07/18/2013
 
 
 FROM ubuntu:12.10
@@ -26,7 +26,13 @@ RUN apt-get update
 ENV DEBIAN_FRONTEND noninteractive
 
 # Installing the environment required: xserver, xdm, flux box, roc-filer and ssh
-RUN apt-get install -y xpra rox-filer ssh pwgen
+RUN apt-get install -y xpra rox-filer ssh pwgen xserver-xephyr xdm fluxbox
+
+# Configuring xdm to allow connections from any IP address and ssh to allow X11 Forwarding. 
+RUN sed -i 's/DisplayManager.requestPort/!DisplayManager.requestPort/g' /etc/X11/xdm/xdm-config
+RUN sed -i '/#any host/c\*' /etc/X11/xdm/Xaccess
+RUN ln -s /usr/bin/Xorg /usr/bin/X
+RUN echo X11Forwarding yes >> /etc/ssh/ssh_config
 
 # Upstart and DBus have issues inside docker. We work around in order to install firefox.
 RUN dpkg-divert --local --rename --add /sbin/initctl && ln -s /bin/true /sbin/initctl
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ ROX-Filer creates a very minimalist way to manage the files and icons on the des
 
 ![Docker L](image/docker-desktop.png "Docker-Desktop")
 
-OBS: The client machine needs to have a X11 server installed. See the "Notes" below. 
+OBS: The client machine needs to have a X11 server installed (Xpra). See the "Notes" below. 
 
 ##Docker Installation
 
@@ -74,16 +74,25 @@ $ docker port $CONTAINER_ID 22
 
 ###Connecting to the container 
 
+####Starting the a new session 
+
 ```
 $ ifconfig | grep "inet addr:" 
 inet addr:192.168.56.102  Bcast:192.168.56.255  Mask:255.255.255.0 # This is the LAN's IP for this machine
 
-$ ssh -YC -c blowfish docker@192.168.56.102 -p 49153 ./docker-desktop # Here is where we use the external port
-docker@192.168.56.102's password: xxxxxxxxxxxx # The Desktop should open up automatically after you type the password
+$ ssh docker@192.168.56.102 -p 49153 ./docker-desktop -s 800x600 -d 10 # Here is where we use the external port
+docker@192.168.56.102's password: xxxxxxxxxxxx 
+
+-s = Screen Resolution
+-d = Session Number
+```
+
+####Attaching to the session started
+
+```
+$ xpra --ssh="ssh -p 49153" attach ssh:docker@192.168.56.102:10 # user@ip_address:session_number
+docker@192.168.56.102's password: xxxxxxxxxxxx 
 
--Y = Trusted X11 Forwarding
--C = Use compression 
--c blowfish = It's one of the fastest compression type available
 ```
 Once you establish the connection, the file /home/docker/docker-desktop is executed. It takes care of attaching to the previous session or creating a new one, if it doesn’t exist.
 
@@ -93,13 +102,15 @@ If you are connecting from a Windows Machine, you can use Putty. Please check th
 
 ###On Windows:
 Requirements:
-- Xming (http://sourceforge.net/projects/xming/)
-- Putty (http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)
-- Configuration Tutorial (https://wiki.utdallas.edu/wiki/display/FAQ/X11+Forwarding+using+Xming+and+PuTTY)
+- Xpra (https://www.xpra.org/dists/windows/)
+- Path: C:\Program Files(x86)\Xpra\Xpra_cmd.exe
 
 ###On OS X:
 Requirements:
-- XQuartz (http://xquartz.macosforge.org/landing/)
+- Xpra (https://www.xpra.org/dists/osx/x86/)
+- Path: /Applications/Xpra.app/Contents/Helpers/xpra
 
 ###On Linux:
-There is no requiment. If you have a Linux Desktop you should have X11 server installed already.
+Requirements:
+- Xpra: You can use apt-get to install it -> apt-get install xpra
+- Path: /usr/bin/xpra
diff --git a/config.tar b/config.tar
diff --git a/startup.sh b/startup.sh
@@ -20,5 +20,8 @@ cd /src; tar -C /home/docker -xvf config.tar
 #Set all the files and subdirectories from /home/docker with docker permissions. 
 chown -R docker:docker /home/docker/*
 
+# restarts the xdm service
+/etc/init.d/xdm restart
+
 # Start the ssh service
 /usr/sbin/sshd -D
