v4.3.2 release

CHANGELOG.md

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Project website: https://github.com/mviereck/x11docker
 
-## [Unreleased]
+## [4.3.2](https://github.com/mviereck/x11docker/releases/tag/v4.3.2) - 2018-06-03
 ### Changed
  - `x11docker-gui` is interactive now. Live preview of generated command. 
    Starting multiple x11docker instances possible. Copy-to-clipboard button.

README.md

@@ -450,7 +450,7 @@ docker run --rm -e DISPLAY=:1 \
 This solution is more secure than the above one as it does not give access to display :0 with host applications and does not need `--ipc=host`. To use this with single applications you can run a host window manager on Xephyr display, too, for example with `env DISPLAY=:1 x-window-manager`.
 
 # Examples
-Some example images can be found on docker hub: https://hub.docker.com/u/x11docker/
+Some image examples can be found on docker hub: https://hub.docker.com/u/x11docker/
 
  - Single GUI application in container: 
    - Terminal: `x11docker x11docker/xfce xfce4-terminal`

x11docker

@@ -10,26 +10,12 @@
 # Type 'x11docker --help' or scroll down to read usage information.
 # More documentation at:  https://github.com/mviereck/x11docker
 
-Version="4.3.2-beta"
+Version="4.3.2"
 
 usage() {               # --help: show usage information
   echo "
 x11docker: Run GUI applications and desktop environments in docker.
 
- Optional features:
-   * Hardware acceleration for OpenGL
-   * Pulseaudio and ALSA sound
-   * Clipboard sharing
-   * Persistent home folders
-   * Wayland support
-   * Language locale creation
-   * Init system support (systemd, SysVinit, OpenRC, runit, tini)
-   * DBus in container
- Focus on security:
-   * Avoids X security leaks using additional X servers.
-   * Container user is same as host user to avoid root in container.
-   * Restricts container capabilities to bare minimum.
-    
 Usage:
 To run a docker image with new X server (auto-choosing X server):
   x11docker [OPTIONS] IMAGE [COMMAND]
@@ -40,6 +26,20 @@ To run a host application on a new X server:
 To run only a new empty X server:
   x11docker [OPTIONS]
 
+Optional features:
+  * Hardware acceleration for OpenGL
+  * Pulseaudio and ALSA sound
+  * Clipboard sharing
+  * Persistent home folders
+  * Wayland support
+  * Language locale creation
+  * Init system support (systemd, SysVinit, OpenRC, runit, tini)
+  * DBus in container
+Focus on security:
+  * Avoids X security leaks using additional X servers.
+  * Container user is same as host user to avoid root in container.
+  * Restricts container capabilities to bare minimum.
+
 Dependencies on host:
   Depending on chosen options, x11docker needs some packages to be installed. 
   It will check for them on startup and show messages if some are missing. 
@@ -57,8 +57,12 @@ Dependencies on host:
        xserver-xorg-legacy xserver-xorg-video-dummy
        
 Dependencies in image:
-  Doesn't have dependencies inside of docker images, except for
-  options --gpu, --lang and --pulseaudio, see below at option descriptions.
+  Doesn't have dependencies inside of docker images, except for options:
+   --gpu:  OpenGL packages, mostly already installed as package dependencies.
+   --lang: localedef to create missing language locales.
+   --pulseaudio: sound with pulseaudio needs pulseaudio on host and in image.
+   --dbus, --dbus-system: needs obviously dbus in image.
+   --systemd, --runit,--openrc, --sysvinit: init systems need to be installed.
    
 Options:
      --help            display this message and exit.
@@ -270,7 +274,7 @@ Installation options (need root permissions):
      --remove          Remove x11docker from your system.
 
 x11docker version: $Version
-Please report issues at https://github.com/mviereck/x11docker
+Please report issues and get help at: https://github.com/mviereck/x11docker
 "
 }
 license() {             # --license: show license (MIT)
@@ -376,7 +380,7 @@ echo -e "
   [ -n "$Hostxenv" ] && export $Hostxenv
   [ -n "$Newxenv" ] && {
     [ "$Tty" = "yes" ] && export $Newxenv
-    [ "$Xserver" = "--xorg" ] && export $Newxenv
+    [ "$Xserver" = "--xorg" ] && [ -e "$Newxsocket" ] && export $Newxenv
   }
   [ "$Silent" = "no" ] && alertbox "x11docker ERROR" "$Message"
 
@@ -3399,6 +3403,7 @@ done
           Imagecommand=""
           Hostexebasename="xonly"
           X11dockermode="exe"
+          Showdisplayenvironment="yes"
         ;;
       esac
     ;;
@@ -3990,8 +3995,7 @@ DefaultEnvironment=DISPLAY=$Newdisplay XAUTHORITY=$Cshare/Xclientcookie $(IFS=$'
   echo "# refresh list of available images for x11docker-gui"
   echo "mkfile $Cachebasefolder/x11docker-gui/images.list"
   echo "while read -r Line ; do"
-  echo '  Line="${Line%:<none>}"'
-  echo '  [ "$Line" = "<none>" ] || echo $Line >> '$Cachebasefolder/x11docker-gui/images.list
+  echo '  grep -q "<none>" <<<$Line || echo $Line >> '$Cachebasefolder/x11docker-gui/images.list
   echo 'done < <(docker images --format "{{.Repository}}:{{.Tag}}" 2>/dev/null | sort)'
   echo ""