Skip to content

Commit

Permalink
add runtime oci to known runtimes #205
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Dec 13, 2019
1 parent d0f663b commit e2550c6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ Project website: https://github.com/mviereck/x11docker
- `--xoverip`: New option to enforce X over TCP/IP. For special setups only.
[(#201)](https://github.com/mviereck/x11docker/issues/201)
### Changed
- `--xephyr`: Disabled Xephyr option `-glamor`.
[(#196)](https://github.com/mviereck/x11docker/issues/196)
- `TODO.md` outsourced from x11docker script.
- Run `containerrootrc` with `--privileged`. Does not affect desired
container command in `containerrc`. Allows less privileges with NVIDIA
driver installation and avoids issues like in
[(#196)](https://github.com/mviereck/x11docker/issues/196)
- `--xephyr`: Disabled Xephyr option `-glamor`.
[(#196)](https://github.com/mviereck/x11docker/issues/196)
- `--runtime`: Added `oci` to list of known runtimes.
[(#205)](https://github.com/mviereck/x11docker/issues/205)
- `TODO.md` outsourced from x11docker script.
### Fixed
- Support `snap` installation of Docker.
[(#191)](https://github.com/mviereck/x11docker/issues/191)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ Container runtimes known and supported by x11docker are:
- Some x11docker options are not possible with `--runtime=kata-runtime`. Most important: `--hostdisplay`, `--gpu`, `--printer`, `--webcam` and all Wayland related options.
- [`nvidia`](https://github.com/mviereck/x11docker/wiki/NVIDIA-driver-support-for-docker-container#nvidianvidia-docker-images): Specialized fork of `runc` to support `nvidia/nvidia-docker` images.
- [`crun`](https://github.com/giuseppe/crun): Fast and lightweight alternative to `runc` with same functionality.
- `oci`: Runtime reported in [#205](https://github.com/mviereck/x11docker/issues/205), no documentation found. Handled by x11docker like `runc`.

Possible runtime configuration in `/etc/docker/daemon.json`:
```
Expand Down

0 comments on commit e2550c6

Please sign in to comment.