Skip to content

Commit

Permalink
release v7.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Jun 27, 2022
1 parent 67fb9e1 commit ca67917
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
## [7.3.0](https://github.com/mviereck/x11docker/releases/tag/v7.3.0) - 2022-06-27
### Added
- `--clipboard`: New arguments `oneway`, `altv` and `superv`
to restrict container access to host clipboard content.
Expand All @@ -17,7 +17,7 @@ Project website: https://github.com/mviereck/x11docker
are open or to stop them as soon as keyword ARG disappears from xwininfo.
[(#68)](https://github.com/mviereck/x11docker/issues/68)
### Fixed
- `*-xwayland`: Startup fix for `--xc=no` / no X server image.
- `*-xwayland`: Startup fix for `--xc=no` / running on host.
- `--xpra*-xwayland`: Use `xdotool` from X container if available.

## [7.2.0](https://github.com/mviereck/x11docker/releases/tag/v7.2.0) - 2022-06-21
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,10 @@ Hardware acceleration for OpenGL is possible with option `-g, --gpu`.
for driver version < v470.x and Xwayland < v22.1.2.
### Clipboard
Clipboard sharing is possible with option `-c, --clipboard`.
- Some X server options need package `xclip` on host.
Clipboard sharing is possible with option `-c, --clipboard`.
- Optional arguments `superv` and `altv` only provide host clipboard content to container if keys `[SUPER][v]` or `[ALT][v]` are pressed.
- Optional argument `oneway` only transfers clipboard content from container to host.
### Sound
Sound is possible with options `-p, --pulseaudio` and `--alsa`.
- For pulseaudio sound with `--pulseaudio` you need `pulseaudio` on host and `pulseaudio` (at least the `pulseaudio` client libraries) in image.
Expand Down Expand Up @@ -451,7 +452,7 @@ Much thanks to the maintainers that decided to provide these packages!
### Manual installation
#### Installation options
As root you can install, update and remove x11docker in system directories to be available system-wide:
- `x11docker --install` : install x11docker and x11docker-gui from current directory. (Useful to install from an extracted `zip` file or a cloned `git` repository.)
- `x11docker --install` : install x11docker from current directory. (Useful to install from an extracted `zip` file or a cloned `git` repository.)
- `x11docker --update` : download and install latest [release](https://github.com/mviereck/x11docker/releases) from github.
- `x11docker --update-master` : download and install latest master version from github.
- `x11docker --remove` : remove all files installed by x11docker.
Expand Down Expand Up @@ -514,7 +515,7 @@ Dependencies in image:
## Troubleshooting
For troubleshooting run `x11docker` or `x11docker-gui` in a terminal.
For troubleshooting run `x11docker` in a terminal.
x11docker shows warnings if something is insecure, missing or going wrong.
Also it shows notes if options don't work and fallbacks are used.
It might give hints to fix some issues.
Expand Down Expand Up @@ -639,7 +640,7 @@ x11docker --build x11docker/fvwm
### Desktop environments
| Desktop environment <br> (most based on Debian)| x11docker command |
| --- | --- |
| [Cinnamon](https://github.com/mviereck/dockerfile-x11docker-cinnamon) | `x11docker --desktop --gpu --init=systemd x11docker/cinnamon` |
| [Cinnamon](https://github.com/mviereck/dockerfile-x11docker-cinnamon) | `x11docker --desktop --gpu --init=systemd --cap-default x11docker/cinnamon` |
| [deepin](https://github.com/mviereck/dockerfile-x11docker-deepin) ([website](https://www.deepin.org/en/dde/)) (3D desktop from China) | `x11docker --desktop --gpu --init=systemd -- --cap-add=IPC_LOCK -- x11docker/deepin` |
| [Enlightenment](https://github.com/mviereck/dockerfile-x11docker-enlightenment) (based on [Void Linux](https://www.voidlinux.org/)) | `x11docker --desktop --gpu --runit x11docker/enlightenment` |
| [Fluxbox](https://github.com/mviereck/dockerfile-x11docker-fluxbox) (based on Debian, 87 MB) | `x11docker --desktop x11docker/fluxbox` |
Expand Down
3 changes: 2 additions & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
x11docker ToDo notes

## Work in progress
-
- --xc --xorg: MIT-SHM fails
- --xc=podman --xorg fails
- --xc --xorg rootless fails
- --xc --weston on console: tty switch fails with unprivileged user

- --backend=host: check X container
Expand Down
4 changes: 2 additions & 2 deletions x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Run 'x11docker --help' or scroll down to read usage information.
# More documentation at: https://github.com/mviereck/x11docker

Version="7.3.0-beta-2"
Version="7.3.0"

# --enforce-i: Enforce running in interactive mode to allow commands tty and weston-launch in special setups.
grep -q -- "--enforce-i" <<< "$*" && case $- in
Expand Down Expand Up @@ -10651,7 +10651,7 @@ unpriv_xcbackend(){ # run X container backend rootful or rootless
return $?
}
main() {
[ "$(uname -s)" = "Darwin" ] && echo "Error: x11docker does not run on Mac" >&2 && exit 64
[ "$(uname -s)" = "Darwin" ] && echo "Error: x11docker does not run on MacOS. Please use Linux." >&2 && exit 64

trap finish EXIT
trap finish_sigint SIGINT
Expand Down

0 comments on commit ca67917

Please sign in to comment.