Skip to content

Commit

Permalink
release v7.6.0: use prefix /usr/local instead of /usr #479
Browse files Browse the repository at this point in the history
--remove-oldprefix: new option -479
  • Loading branch information
Lauscher authored and Lauscher committed Jan 18, 2023
1 parent 51f9c56 commit f499d23
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 91 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

Project website: https://github.com/mviereck/x11docker

## [7.6.0](https://github.com/mviereck/x11docker/releases/tag/v7.6.0) - 2023-01-18
### Changed
- Up to version 7.5.0 x11docker installed itself with prefix `/usr`,
now it uses `/usr/local`. This serves to follow the
[Linux Foundation specifications of `/usr/local`.](https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s09.html).
To help with the transition, a new option `--remove-oldprefix`
was introduced. Recommended procedure:
- First run: `x11docker --update`
- Afterwards run: `x11docker --remove-oldprefix`
### Added
- `--remove-oldprefix`: Remove installation in old prefix `/usr`.
[(479)](https://github.com/mviereck/x11docker/issues/479)

## [7.5.0](https://github.com/mviereck/x11docker/releases/tag/v7.5.0) - 2023-01-16
### Added
- `man` page for x11docker. (Run update from 7.4.2 twice to install it.)
Expand All @@ -21,7 +34,7 @@ Project website: https://github.com/mviereck/x11docker
[(478)](https://github.com/mviereck/x11docker/issues/478)
- Replace `getent` with custom `grep` command.
[(477)](https://github.com/mviereck/x11docker/issues/477)
- `--install|--update*`: Do not dpend on backend.
- `--install|--update*`: Do not depend on backend.
[(470)](https://github.com/mviereck/x11docker/issues/470)
### Deprecated
- `--backend=proot`: Deprecated because likely no one uses it,
Expand Down
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ Files to work on can be shared between host and container.
Since a while Docker distributes a version called "Docker Desktop" that runs Docker in a QEMU VM. x11docker is not designed to support this VM based version.
Instead, use x11docker with the native ["Docker Engine Server version"](https://docs.docker.com/engine/install/#server) that uses your host kernel to run containers.
- If you install Docker from your distribution's repository, you'll likely get this native version.
- If you prefer podman over Docker, you'll don't need to care about this difference.
- The supported native Docker Engine package name is mostly `docker.io` or `docker-ce`, in opposite to the non-supported VM based `docker-desktop` package.
- If you prefer podman over Docker, you don't need to care about this difference.

### TL;DR
For a quick start:
Expand Down Expand Up @@ -452,16 +453,18 @@ As root you can install, update and remove x11docker in system directories to be
- `x11docker --update-master` : download and install latest master version from github.
- `x11docker --remove` : remove all files installed by x11docker.
- Note: This does not remove `~/.local/share/x11docker` where it stores persistent files of option `--home`.
- `x11docker --remove-oldprefix` : Before version 7.6.0 x11docker installed itself into `/usr/bin`.
Now it installs into `/usr/local/bin`. Use `--remove-oldprefix` to remove `/usr/bin` installations.
To see the difference between current and coming updated version, you can use optional argument `diff` for `--update` and `--update-master`.
Example: `x11docker --update-master=diff` will show you the code changes from your current installation to latest master/beta version without installing it.
#### Installed files
What the installation does (just for information):
- Copies script `x11docker` to `/usr/bin`.
- Installs icon `x11docker.png` in `/usr/share/icons` using `xdg-icon-resource`.
- Copies documentation `README.md`, `CHANGELOG.md` and `LICENSE.txt` to `/usr/share/doc/x11docker`.
- Stores `man` page for x11docker in `/usr/share/man/man1/x11docker.1.gz`.
- Copies script `x11docker` to `/usr/local/bin`.
- Installs icon `x11docker.png` below `/usr/share/icons` using `xdg-icon-resource`.
- Copies documentation `README.md`, `CHANGELOG.md` and `LICENSE.txt` to `/usr/local/share/doc/x11docker`.
- Stores `man` page for x11docker in `/usr/local/share/man/man1/x11docker.1.gz`.
#### Shortest way for first installation:
- For systems using `sudo`:
Expand Down
Loading

0 comments on commit f499d23

Please sign in to comment.