From b653cfc18f149d9f617c6118ac5e9fa21063b98e Mon Sep 17 00:00:00 2001 From: Blixa Morgan Date: Sun, 2 Mar 2014 03:16:20 -0600 Subject: [PATCH 01/22] Update Dockerfile Add force option to initctl on rule. Removed oddly unavalible restricted-extras package. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a05a33..d1d5bce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ 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 +RUN dpkg-divert --local --rename --add /sbin/initctl && ln -sf /bin/true /sbin/initctl # Installing fuse package (libreoffice-java dependency) and it's going to try to create # a fuse device without success, due the container permissions. || : help us to ignore it. @@ -48,7 +48,7 @@ RUN apt-get -y install fuse # Installing the apps: Firefox, flash player plugin, LibreOffice and xterm # libreoffice-base installs libreoffice-java mentioned before -RUN apt-get install -y libreoffice-base firefox libreoffice-gtk libreoffice-calc xterm ubuntu-restricted-extras +RUN apt-get install -y libreoffice-base firefox libreoffice-gtk libreoffice-calc xterm # Set locale (fix the locale warnings) RUN localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : From 3e5d5316090913a8adc7ec87adbdce624de55732 Mon Sep 17 00:00:00 2001 From: paimpozhil Date: Thu, 1 May 2014 16:50:31 -0400 Subject: [PATCH 02/22] Fix sudo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1d5bce..5529903 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ 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 xserver-xephyr xdm fluxbox +RUN apt-get install -y xpra rox-filer ssh pwgen xserver-xephyr xdm fluxbox sudo # 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 From 954712a8aa718e1ba07da1d777528edefa2a84ab Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Fri, 25 Jul 2014 17:11:39 -0700 Subject: [PATCH 03/22] Fix Ubuntu 12.10 - apt-get update error 404 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5529903..5d19ca1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ # Date: 07/28/2013 -FROM ubuntu:12.10 +FROM ubuntu:14.04 MAINTAINER Roberto G. Hashioka "roberto_hashioka@hotmail.com" RUN apt-get update From ec5fb9444d79d8edd9ecdc6f3435135ebc2edaaf Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Mon, 28 Jul 2014 13:30:27 -0700 Subject: [PATCH 04/22] Fix login PAM issue with ssh --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d19ca1..5eb59c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ 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 xserver-xephyr xdm fluxbox sudo +RUN apt-get install -y xpra rox-filer openssh-server 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 @@ -34,6 +34,9 @@ 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 +# Fix PAM login issue with sshd +RUN sed -i 's/session required pam_loginuid.so/#session required pam_loginuid.so/g' /etc/pam.d/sshd + # Upstart and DBus have issues inside docker. We work around in order to install firefox. RUN dpkg-divert --local --rename --add /sbin/initctl && ln -sf /bin/true /sbin/initctl From 770b660d002c207d505129e4eb50cb1ee4c6064e Mon Sep 17 00:00:00 2001 From: Florian Breuer Date: Wed, 13 Aug 2014 02:57:03 +0200 Subject: [PATCH 05/22] Added a packet (Xvfb) to make the program work under ubuntu 14.04 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5eb59c0..1ba2909 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ 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 openssh-server pwgen xserver-xephyr xdm fluxbox +RUN apt-get install -y xpra rox-filer openssh-server pwgen xserver-xephyr xdm fluxbox xvfb # 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 From 751bc2dfbfe1ea388c79fee5ea442e672f8ca0b6 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Mon, 18 Aug 2014 00:44:22 -0700 Subject: [PATCH 06/22] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b735ea4..d572666 100644 --- a/README.md +++ b/README.md @@ -115,12 +115,12 @@ Eg. DISPLAY=:10 firefox & ###On Windows: Requirements: -- Xpra <= 0.9.8 (https://www.xpra.org/dists/windows/) +- Xpra <= 14.0 (https://www.xpra.org/dists/windows/) - Path: C:\Program Files(x86)\Xpra\Xpra_cmd.exe ###On OS X: Requirements: -- Xpra Version <= 0.9.8 (https://www.xpra.org/dists/osx/x86/) +- Xpra Version <= 14.0 (https://www.xpra.org/dists/osx/x86/) - Path: /Applications/Xpra.app/Contents/Helpers/xpra From ffd8083c0193868017b629d6774ba6e79baaadcf Mon Sep 17 00:00:00 2001 From: "Roberto G. Hashioka" Date: Tue, 19 Aug 2014 07:33:13 +0000 Subject: [PATCH 07/22] Added missing sudo package --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1ba2909..1e33b91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ 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 openssh-server pwgen xserver-xephyr xdm fluxbox xvfb +RUN apt-get install -y xpra rox-filer openssh-server pwgen xserver-xephyr xdm fluxbox xvfb sudo # 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 From 5b5927e9901e53ade1f4604ad4116d0f656d1398 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Tue, 19 Aug 2014 00:36:41 -0700 Subject: [PATCH 08/22] Updated README: run docker-desktop in background --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d572666..88c5d53 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ $ docker port $CONTAINER_ID 22 $ 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 docker@192.168.56.102 -p 49153 ./docker-desktop -s 800x600 -d 10 # Here is where we use the external port +$ ssh docker@192.168.56.102 -p 49153 "sh -c './docker-desktop -s 800x600 -d 10 > /dev/null 2>&1 &'" # Here is where we use the external port docker@192.168.56.102's password: xxxxxxxxxxxx $ ./docker-desktop -h From 776e7b928809d3ed20e8ad8750ec424dd80ae0e3 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Tue, 19 Aug 2014 00:45:10 -0700 Subject: [PATCH 09/22] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad280ba..cb10712 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.4.0 (2014-08-19) + + OS: Upgraded from 12.10 to 14.04 + + Fixed Issue: Added a packet (Xvfb) to make the program work under ubuntu 14.04 (by @clu2) + + Fixed Issue: Fix login PAM issue with ssh + ## 0.3.0 (2013-07-18) + Funcionality: Allow users to configure the screen resolution + Funcionality: Allow users to create multi-sessions From c465adfda97ad2a3265b4dd8b710de2d67e805f0 Mon Sep 17 00:00:00 2001 From: Igor Belayev Date: Mon, 22 Sep 2014 20:24:25 -0400 Subject: [PATCH 10/22] - need to update ubuntu links, otherwise cant install basic packages. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e33b91..d7a4b41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM ubuntu:14.04 MAINTAINER Roberto G. Hashioka "roberto_hashioka@hotmail.com" -RUN apt-get update +RUN apt-get update -y # Set the env variable DEBIAN_FRONTEND to noninteractive ENV DEBIAN_FRONTEND noninteractive From 68d7ca9df47b98f3ba58184c951e49098024dc24 Mon Sep 17 00:00:00 2001 From: Igor Belayev Date: Mon, 22 Sep 2014 20:37:04 -0400 Subject: [PATCH 11/22] - need to update packages for security fixes. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d7a4b41..14764ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ FROM ubuntu:14.04 MAINTAINER Roberto G. Hashioka "roberto_hashioka@hotmail.com" RUN apt-get update -y +RUN apt-get upgrade -y # Set the env variable DEBIAN_FRONTEND to noninteractive ENV DEBIAN_FRONTEND noninteractive From 0952e52c552310fe9568b61cca7b928646dbc480 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Thu, 25 Sep 2014 21:52:18 -0700 Subject: [PATCH 12/22] Add Roberto Hashioka as maintainer --- MAINTAINER | 1 + 1 file changed, 1 insertion(+) create mode 100644 MAINTAINER diff --git a/MAINTAINER b/MAINTAINER new file mode 100644 index 0000000..ee65e0b --- /dev/null +++ b/MAINTAINER @@ -0,0 +1 @@ +Roberto Hashioka (@rogaha) \ No newline at end of file From a60f9326ef45eeb403f88bb33e7d08de0a08b930 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Thu, 25 Sep 2014 21:49:09 -0700 Subject: [PATCH 13/22] Add Paim Pozhil as Maintainer --- MAINTAINER | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINER b/MAINTAINER index ee65e0b..d2a6474 100644 --- a/MAINTAINER +++ b/MAINTAINER @@ -1 +1,2 @@ -Roberto Hashioka (@rogaha) \ No newline at end of file +Roberto Hashioka (@rogaha) +Paim Pozhil (@paimpozhil) From e78dfaf9a2eb0e03a52c5261f5b24e14852b7436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=BCrmann?= Date: Tue, 24 May 2016 16:25:41 +0200 Subject: [PATCH 14/22] the code was not running copy pasted --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88c5d53..5a7c9ac 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Requirements: ###Building the docker image ``` -$ docker build -t [username]/docker-desktop git://github.com/rogaha/docker-desktop.git +$ docker build -t rogaha/docker-desktop git://github.com/rogaha/docker-desktop.git OR From 8c87e5ab6f156cdc12c73d00e0196a829b611597 Mon Sep 17 00:00:00 2001 From: Daniel Groves Date: Tue, 2 May 2017 13:16:16 +0100 Subject: [PATCH 15/22] Fixes readme for GitHub rendering There was no spaces between the # designator for a title and the start of the text, which means GitHub wouldn't render the titles as such. This commit fixes this. --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 5a7c9ac..b11b928 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ DOCKER-DESKTOP ============== -##Description +## Description This Dockerfile creates a docker image and once it's executed it creates a container that runs X11 and SSH services. The ssh is used to forward X11 and provide you encrypted data communication between the docker container and your local machine. @@ -17,9 +17,9 @@ Fluxbox and ROX-Filer creates a very minimalist way to manages the windows and f OBS: The client machine needs to have a X11 server installed (Xpra). See the "Notes" below. -##Docker Installation +## Docker Installation -###On Ubuntu: +### On Ubuntu: Docker is available as a Ubuntu PPA (Personal Package Archive), hosted on launchpad which makes installing Docker on Ubuntu very easy. ``` @@ -32,18 +32,18 @@ sudo apt-get update # Install, you will see another warning that the package cannot be authenticated. Confirm install. sudo apt-get install lxc-docker ``` -###On Windows: +### On Windows: Requirements: - Installation Tutorial (http://docs.docker.io/en/latest/installation/windows/) -###On Mac OS X: +### On Mac OS X: Requirements: - Installation Tutorial (http://docs.docker.io/en/latest/installation/vagrant/) -##Installation +## Installation -###Building the docker image +### Building the docker image ``` $ docker build -t rogaha/docker-desktop git://github.com/rogaha/docker-desktop.git @@ -55,13 +55,13 @@ $ cd docker-desktop $ docker build -t [username]/docker-desktop . ``` -###Running the docker image created (-d: detached mode, -P: expose the port 22 on the host machine) +### Running the docker image created (-d: detached mode, -P: expose the port 22 on the host machine) ``` $ CONTAINER_ID=$(docker run -d -P [username]/docker-desktop) ``` -###Getting the password generated during runtime +### Getting the password generated during runtime ``` $ echo $(docker logs $CONTAINER_ID | sed -n 1p) @@ -69,18 +69,18 @@ User: docker Password: xxxxxxxxxxxx # where xxxxxxxxxxxx is the password created by PWGen that contains at least one capital letter and one number ``` -##Usage +## Usage -###Getting the container's external ssh port +### Getting the container's external ssh port ``` $ docker port $CONTAINER_ID 22 49153 # This is the external port that forwards to the ssh service running inside of the container as port 22 ``` -###Connecting to the container +### Connecting to the container -####Starting the a new session +#### Starting the a new session ``` $ ifconfig | grep "inet addr:" @@ -99,7 +99,7 @@ Usage: docker-desktop [-s screen_size] [-d session_number] ----------------------------------------------------------- ``` -####Attaching to the session started +#### Attaching to the session started ``` $ xpra --ssh="ssh -p 49153" attach ssh:docker@192.168.56.102:10 # user@ip_address:session_number @@ -111,20 +111,20 @@ DISPLAY=:[session_number] [program_name] & Eg. DISPLAY=:10 firefox & -##Notes +## Notes -###On Windows: +### On Windows: Requirements: - Xpra <= 14.0 (https://www.xpra.org/dists/windows/) - Path: C:\Program Files(x86)\Xpra\Xpra_cmd.exe -###On OS X: +### On OS X: Requirements: - Xpra Version <= 14.0 (https://www.xpra.org/dists/osx/x86/) - Path: /Applications/Xpra.app/Contents/Helpers/xpra -###On Linux: +### On Linux: Requirements: - Xpra: You can use apt-get to install it -> apt-get install xpra - Path: /usr/bin/xpra From 4d4d9c84b88ff0917ce08cf739bd027fd7f0e4a5 Mon Sep 17 00:00:00 2001 From: Ben Yanke Date: Mon, 4 Dec 2017 12:07:16 -0600 Subject: [PATCH 16/22] Update README.md --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 5a7c9ac..968705d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ DOCKER-DESKTOP ============== -##Description +## Description This Dockerfile creates a docker image and once it's executed it creates a container that runs X11 and SSH services. The ssh is used to forward X11 and provide you encrypted data communication between the docker container and your local machine. @@ -17,13 +17,13 @@ Fluxbox and ROX-Filer creates a very minimalist way to manages the windows and f OBS: The client machine needs to have a X11 server installed (Xpra). See the "Notes" below. -##Docker Installation +## Docker Installation -###On Ubuntu: +### On Ubuntu: Docker is available as a Ubuntu PPA (Personal Package Archive), hosted on launchpad which makes installing Docker on Ubuntu very easy. ``` -#Add the PPA sources to your apt sources list. +# Add the PPA sources to your apt sources list. sudo apt-get install python-software-properties && sudo add-apt-repository ppa:dotcloud/lxc-docker # Update your sources @@ -32,18 +32,18 @@ sudo apt-get update # Install, you will see another warning that the package cannot be authenticated. Confirm install. sudo apt-get install lxc-docker ``` -###On Windows: +### On Windows: Requirements: - Installation Tutorial (http://docs.docker.io/en/latest/installation/windows/) -###On Mac OS X: +### On Mac OS X: Requirements: - Installation Tutorial (http://docs.docker.io/en/latest/installation/vagrant/) -##Installation +## Installation -###Building the docker image +### Building the docker image ``` $ docker build -t rogaha/docker-desktop git://github.com/rogaha/docker-desktop.git @@ -55,13 +55,13 @@ $ cd docker-desktop $ docker build -t [username]/docker-desktop . ``` -###Running the docker image created (-d: detached mode, -P: expose the port 22 on the host machine) +### Running the docker image created (-d: detached mode, -P: expose the port 22 on the host machine) ``` $ CONTAINER_ID=$(docker run -d -P [username]/docker-desktop) ``` -###Getting the password generated during runtime +### Getting the password generated during runtime ``` $ echo $(docker logs $CONTAINER_ID | sed -n 1p) @@ -69,18 +69,18 @@ User: docker Password: xxxxxxxxxxxx # where xxxxxxxxxxxx is the password created by PWGen that contains at least one capital letter and one number ``` -##Usage +## Usage -###Getting the container's external ssh port +### Getting the container's external ssh port ``` $ docker port $CONTAINER_ID 22 49153 # This is the external port that forwards to the ssh service running inside of the container as port 22 ``` -###Connecting to the container +### Connecting to the container -####Starting the a new session +#### Starting the a new session ``` $ ifconfig | grep "inet addr:" @@ -99,7 +99,7 @@ Usage: docker-desktop [-s screen_size] [-d session_number] ----------------------------------------------------------- ``` -####Attaching to the session started +#### Attaching to the session started ``` $ xpra --ssh="ssh -p 49153" attach ssh:docker@192.168.56.102:10 # user@ip_address:session_number @@ -111,20 +111,20 @@ DISPLAY=:[session_number] [program_name] & Eg. DISPLAY=:10 firefox & -##Notes +## Notes -###On Windows: +### On Windows: Requirements: - Xpra <= 14.0 (https://www.xpra.org/dists/windows/) - Path: C:\Program Files(x86)\Xpra\Xpra_cmd.exe -###On OS X: +### On OS X: Requirements: - Xpra Version <= 14.0 (https://www.xpra.org/dists/osx/x86/) - Path: /Applications/Xpra.app/Contents/Helpers/xpra -###On Linux: +### On Linux: Requirements: - Xpra: You can use apt-get to install it -> apt-get install xpra - Path: /usr/bin/xpra From 149cfb6acfc39f9ac6f028c30f0368ed5aecfce4 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Tue, 10 Apr 2018 23:01:55 -0700 Subject: [PATCH 17/22] fix typos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a7c9ac..5d9c077 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Xpra + Xephyr allows to display the applications running inside of the container The applications can be rootless, so the client machine manages the windows that are displayed. -Fluxbox and ROX-Filer creates a very minimalist way to manages the windows and files. +Fluxbox and ROX-Filer creates a very minimalist way to manage windows and files. ![Docker L](image/docker-desktop.png "Docker-Desktop") From f5a38bd65d22d4600cfb3c1cb8eb069282736543 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Tue, 10 Apr 2018 23:03:15 -0700 Subject: [PATCH 18/22] fix markdown --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5d9c077..6254f17 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ DOCKER-DESKTOP ============== -##Description +## Description This Dockerfile creates a docker image and once it's executed it creates a container that runs X11 and SSH services. The ssh is used to forward X11 and provide you encrypted data communication between the docker container and your local machine. @@ -32,18 +32,18 @@ sudo apt-get update # Install, you will see another warning that the package cannot be authenticated. Confirm install. sudo apt-get install lxc-docker ``` -###On Windows: +### On Windows: Requirements: - Installation Tutorial (http://docs.docker.io/en/latest/installation/windows/) -###On Mac OS X: +### On Mac OS X: Requirements: - Installation Tutorial (http://docs.docker.io/en/latest/installation/vagrant/) -##Installation +## Installation -###Building the docker image +### Building the docker image ``` $ docker build -t rogaha/docker-desktop git://github.com/rogaha/docker-desktop.git @@ -55,13 +55,13 @@ $ cd docker-desktop $ docker build -t [username]/docker-desktop . ``` -###Running the docker image created (-d: detached mode, -P: expose the port 22 on the host machine) +### Running the docker image created (-d: detached mode, -P: expose the port 22 on the host machine) ``` $ CONTAINER_ID=$(docker run -d -P [username]/docker-desktop) ``` -###Getting the password generated during runtime +### Getting the password generated during runtime ``` $ echo $(docker logs $CONTAINER_ID | sed -n 1p) @@ -69,18 +69,18 @@ User: docker Password: xxxxxxxxxxxx # where xxxxxxxxxxxx is the password created by PWGen that contains at least one capital letter and one number ``` -##Usage +## Usage -###Getting the container's external ssh port +### Getting the container's external ssh port ``` $ docker port $CONTAINER_ID 22 49153 # This is the external port that forwards to the ssh service running inside of the container as port 22 ``` -###Connecting to the container +### Connecting to the container -####Starting the a new session +#### Starting the a new session ``` $ ifconfig | grep "inet addr:" @@ -99,7 +99,7 @@ Usage: docker-desktop [-s screen_size] [-d session_number] ----------------------------------------------------------- ``` -####Attaching to the session started +#### Attaching to the session started ``` $ xpra --ssh="ssh -p 49153" attach ssh:docker@192.168.56.102:10 # user@ip_address:session_number @@ -111,20 +111,20 @@ DISPLAY=:[session_number] [program_name] & Eg. DISPLAY=:10 firefox & -##Notes +## Notes -###On Windows: +### On Windows: Requirements: - Xpra <= 14.0 (https://www.xpra.org/dists/windows/) - Path: C:\Program Files(x86)\Xpra\Xpra_cmd.exe -###On OS X: +### On OS X: Requirements: - Xpra Version <= 14.0 (https://www.xpra.org/dists/osx/x86/) - Path: /Applications/Xpra.app/Contents/Helpers/xpra -###On Linux: +### On Linux: Requirements: - Xpra: You can use apt-get to install it -> apt-get install xpra - Path: /usr/bin/xpra From 42a5c92bd5238e35572b62ba8a4d824b15b32e7d Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Tue, 10 Apr 2018 23:03:55 -0700 Subject: [PATCH 19/22] fix remaining markdown issues --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6254f17..0ca2474 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ Fluxbox and ROX-Filer creates a very minimalist way to manage windows and files. OBS: The client machine needs to have a X11 server installed (Xpra). See the "Notes" below. -##Docker Installation +## Docker Installation -###On Ubuntu: +### On Ubuntu: Docker is available as a Ubuntu PPA (Personal Package Archive), hosted on launchpad which makes installing Docker on Ubuntu very easy. ``` From 4577078a3f302718d38a9911c6df3ce3dbbc717e Mon Sep 17 00:00:00 2001 From: Tomas Antonio Lopez Date: Sun, 13 May 2018 17:26:48 +0200 Subject: [PATCH 20/22] Bumped base image version to Ubuntu 16.04 LTS --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14764ca..3572244 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ # Date: 07/28/2013 -FROM ubuntu:14.04 +FROM ubuntu:16.04 MAINTAINER Roberto G. Hashioka "roberto_hashioka@hotmail.com" RUN apt-get update -y From 2ba316e564adf2c4e084c6277947c34ae7e5191e Mon Sep 17 00:00:00 2001 From: Tomas Antonio Lopez Date: Sun, 13 May 2018 17:28:38 +0200 Subject: [PATCH 21/22] Removed symlinking of /usr/bin/Xorg to /usr/bin/X since symlink is already present in newer versions of Ubuntu --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3572244..155898e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,6 @@ RUN apt-get install -y xpra rox-filer openssh-server pwgen xserver-xephyr xdm fl # 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 # Fix PAM login issue with sshd From 8b7c60a899980197cf16c6d508f8512c9fdceae6 Mon Sep 17 00:00:00 2001 From: Tomas Antonio Lopez Date: Sun, 13 May 2018 18:09:27 +0200 Subject: [PATCH 22/22] Added locales package to the image for localedef to compile locale definitions --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 155898e..622c3a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get upgrade -y ENV DEBIAN_FRONTEND noninteractive # Installing the environment required: xserver, xdm, flux box, roc-filer and ssh -RUN apt-get install -y xpra rox-filer openssh-server pwgen xserver-xephyr xdm fluxbox xvfb sudo +RUN apt-get install -y xpra rox-filer openssh-server pwgen xserver-xephyr xdm fluxbox xvfb locales sudo # 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