release v6.7.0

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]
+## [6.7.0](https://github.com/mviereck/x11docker/releases/tag/v6.7.0) - 2021-02-28
 ### Added
  - `-I, --network`: New option to set network mode.
    `-I` will be mandatory in future to allow internet access.
@@ -36,11 +36,14 @@ Project website: https://github.com/mviereck/x11docker
    [(#290)](https://github.com/mviereck/x11docker/issues/290)
  - `--preset`: Parse with `eval` to catch strings.
    [(x11docker/deepin:#20)](https://github.com/mviereck/dockerfile-x11docker-deepin/issues/20)
+ - MS Windows: IP check / no docketNAT interface anymore.
+   [(runx:#6)](https://github.com/mviereck/runx/issues/6)
+   [(#325)](https://github.com/mviereck/x11docker/issues/325)
 ### Deprecated
  - `--hostnet`: Use `--network=host` instead.
  - `--no-internet`: Use `--network=none` instead.
 
-## [6.6.2](https://github.com/mviereck/x11docker/releases/tag/v6.6.2) - 2022-05-19
+## [6.6.2](https://github.com/mviereck/x11docker/releases/tag/v6.6.2) - 2020-05-19
 ### Added
  - `--home=VOLUME`, `--share=VOLUME`: Support of docker volumes.
    [ehough/docker-kodi#33](https://github.com/ehough/docker-kodi/issues/33)
@@ -53,7 +56,7 @@ Project website: https://github.com/mviereck/x11docker
  - `--sharessh`: Please use (directly or with help of option `--preset`):
    `--share $(dirname $SSH_AUTH_SOCK) --env SSH_AUTH_SOCK="$SSH_AUTH_SOCK"`
 
-## [6.6.1](https://github.com/mviereck/x11docker/releases/tag/v6.6.1) - 2022-03-19
+## [6.6.1](https://github.com/mviereck/x11docker/releases/tag/v6.6.1) - 2020-03-19
 ### Fixed
  - `--runx`: Fix `XAUTHORITY` copy bug. 
    [(#219)](https://github.com/mviereck/x11docker/issues/219)

README.md

@@ -25,7 +25,7 @@ x11docker runs on Linux and (with some setup and limitations) on [MS Windows](#i
    - Restricts container capabilities to bare minimum.
    - Container user is same as host user to avoid root in container.
  - Low [dependencies](#dependencies):
-   - No obliging dependencies on host beside X and Docker. Recommended: `xpra` and `Xephyr`.
+   - No obliging dependencies on host beside X and Docker. Recommended: `nxagent` and `Xephyr`.
    - No dependencies inside of Docker images except for some optional features.
  - Several [optional features](#options) like [GPU](#gpu-hardware-acceleration), [sound](#sound), [webcam](#webcam) and [printer](#printer) support.
  - Remote access with [SSH](https://github.com/mviereck/x11docker/wiki/Remote-access-with-SSH), [VNC](https://github.com/mviereck/x11docker/wiki/VNC) 
@@ -125,17 +125,17 @@ Description of some commonly used feature [options](https://github.com/mviereck/
  - For often used option combinations you can make shortcuts with [option `--preset`](#option---preset).
 
 ### Choice of X servers and Wayland compositors
-If no X server option is specified, x11docker automatically chooses one depending on installed [dependencies](#dependencies) and on given or missing options `--desktop`, `--gpu` and `--wayland`. Most recommended are `xpra` and `Xephyr`.
+If no X server option is specified, x11docker automatically chooses one depending on installed [dependencies](#dependencies) and on given or missing options `--desktop`, `--gpu` and `--wayland`. Most recommended are `nxagent` and `Xephyr`.
  - [Overview of all possible X server and Wayland options.](https://github.com/mviereck/x11docker/wiki/X-server-and-Wayland-Options)
    - [Hints to use option `--xorg` within X.](https://github.com/mviereck/x11docker/wiki/Setup-for-option---xorg)
    - Use option `-t, --tty` to run without X at all.
 
 ### Desktop or seamless mode
 x11docker assumes that you want to run a single application in seamless mode, i.e. a single window on your regular desktop. If you want to run a desktop environment in image, add option `--desktop`. 
- - Seamless mode is supported with options `--xpra` and `--nxagent`. As a fallback insecure option `--hostdisplay` is possible.
+ - Seamless mode is supported with options `--nxagent` and `--xpra`. As a fallback insecure option `--hostdisplay` is possible.
  - Desktop mode with `--desktop` is supported with all X server options except `--hostdisplay`. If available, x11docker prefers `--xephyr` and `--nxagent`.
  - Special case: Single applications with a window manager (option `--wm`).
-   - If neither `xpra` nor `nxagent` are installed, but x11docker finds a desktop capable X server like `Xephyr`, it avoids insecure option `--hostdisplay` and runs Xephyr with a window manager.
+   - If neither `nxagent` nor `xpra` are installed, but x11docker finds a desktop capable X server like `Xephyr`, it avoids insecure option `--hostdisplay` and runs Xephyr with a window manager.
    - If available, x11docker uses image `x11docker/openbox` to run a window manager in its own container. 
    - Another window manager image an be specified with e.g. `--wm=x11docker/lxde`.
    - As a fallback x11docker runs a window manager from host, either autodetected or specified with e.g. `--wm=xfwm4`. 
@@ -386,7 +386,7 @@ x11docker can run with standard system utilities without additional dependencies
  - x11docker checks dependencies for chosen options on startup and shows terminal messages if some are missing. 
 
 For advanced usage of x11docker it is recommended to install some additional packages.
-The recommended base commands are: `xpra` `Xephyr` `weston` `Xwayland` `xdotool` `xauth` `xinit` `xclip` `xhost` `xrandr` `xdpyinfo`. Some of them are probably already installed.
+The recommended base commands are: `nxagent` `Xephyr` `weston` `Xwayland` `xdotool` `xauth` `xinit` `xclip` `xhost` `xrandr` `xdpyinfo`. Some of them are probably already installed.
  - To provide these base commands see [wiki: Dependencies - Recommended base](https://github.com/mviereck/x11docker/wiki/Dependencies#recommended-base) for a package list matching your distribution.
 
 Some feature options have additional dependencies on host and/or in image. This affects especially options `--gpu`, `--printer` and `--pulseaudio`.

TODO.md

@@ -34,12 +34,9 @@ x11docker ToDo notes
  - `elogind` in void container: loginctl is empty. ck-list-sessions, too.
 
 ## Needs investigation and probably 3d party bug report
-  - `--weston-xwayland`: Weston is resizeable now, but Xwayland root window does not draw new area
   - `--xpra-xwayland`, `--weston-xwayland`: Xwayland does not fit Weston window size if parts of weston window are offscreen
   - `startplasmacompositor`: hardcoded `--libinput` causes failure if running nested
   - `kwin_wayland` needs `CAP_SYS_RESOURCE` even if running nested
-  - `--xpra-xwayland --desktop`: resize & redraw issues
-  - `--xpra --desktop`: sometimes redraw issues on resize
   - `--xpra --desktop --xdummy`: --size modeline does not work, might not even appear in xrandr although set in xdummy.xorg.conf
   - `Xwayland` does not support X over IP (`-listen tcp`)
 
@@ -61,8 +58,7 @@ x11docker ToDo notes
  - avoid loosing `dockerstopshell` from process tree
  - avoid loosing hostexe from process tree
  - `dockerstopshell` does not react if fifofile is deleted.
- - reduce number of variables with `storeinfo()`
- - dependeny wiki: Cygwin packages
+ - dependency wiki: Cygwin packages
  - `capsh`: replace `su` with `capsh`? (missing in alpine) But how to trigger login?
  - `x11docker/check`: palinopsia: check video RAM size with `glxinfo`, adjust requested RAM size.
  - further checks of `/etc/pam.d`

x11docker

@@ -11,7 +11,7 @@
 # Run 'x11docker --help' or scroll down to read usage information.
 # More documentation at:  https://github.com/mviereck/x11docker
 
-Version="6.7.0-beta"
+Version="6.7.0"
 
 # --enforce-i: Enforce running in interactive mode to allow commands tty and weston-launch in special setups.
 grep -q -- "--enforce-i" <<< "$*" && case $- in
@@ -8451,7 +8451,7 @@ stdout() {
 }'
 }
 parse_options() {               # parse cli options
-  local Shortoptions Longoptions Parsedoptions Presetoptions Presetfile Parsererror Parsererrorfile
+  local Shortoptions Longoptions Parsedoptions Presetoptions Presetfile
   Shortoptions="aAcdDefFghHiIKlmnpPqtTvVwWxXyY"
   Longoptions="exe,xonly"                                                                                                  # Alternate setups of x11docker
   Longoptions="$Longoptions,auto,desktop,tty,wayland,wm::"                                                                 # Influencing auto-setup of X/Wayland/x11docker
@@ -8480,9 +8480,7 @@ parse_options() {               # parse cli options
   Longoptions="$Longoptions,sys-admin,sysvinit,tini,trusted,untrusted,vcxsrv"                                              # Removed
 
   Parsererrorfile="/tmp/x11docker.parserserror.$Cachenumber"
-  Parsedoptions="$(getopt --options "$Shortoptions" --longoptions "$Longoptions" --name "$0" -- "$@" 2>$Parsererrorfile)"
-  [ -e $Parsererrorfile ] && Parsererror=$(cat $Parsererrorfile) && rm $Parsererrorfile
-  [ "$Parsererror" ] && error "$Parsererror"
+  Parsedoptions="$(getopt --options "$Shortoptions" --longoptions "$Longoptions" --name "$0" -- "$@" )" || error "Failed to parse options."
   eval set -- "$Parsedoptions"
   [ -z "$Parsedoptions_global" ] && Parsedoptions_global="$Parsedoptions"