From 883cc7cb6aab8d73321489001620700e76fe50cf Mon Sep 17 00:00:00 2001 From: Christopher Obbard Date: Thu, 26 Nov 2020 15:47:10 +0000 Subject: [PATCH 1/2] docker: Update example docker usage command The docker command misses adding the kvm group to the container. This is required otherwise the container can't access /dev/kvm Signed-off-by: Christopher Obbard --- docker/README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/README.md b/docker/README.md index 7895a0e5..1a73e5de 100644 --- a/docker/README.md +++ b/docker/README.md @@ -8,7 +8,6 @@ docker pull godebos/debos ``` Debos needs virtualization to be enabled on the host and shared with the container. - Check that `kvm` is enabled and writable by the user running the docker container by running ```ls /dev/kvm``` ## Usage @@ -17,7 +16,14 @@ Check that `kvm` is enabled and writable by the user running the docker containe To build `recipe.yaml`: ``` cd -docker run --rm --interactive --tty --device /dev/kvm --user $(id -u) --workdir /recipes --mount "type=bind,source=$(pwd),destination=/recipes" --security-opt label=disable godebos/debos +docker run --rm --interactive --tty \ + --device /dev/kvm \ + --user $(id -u):$(id -g) \ + --group-add $(getent group kvm | cut -d: -f3) \ + --workdir /recipes \ + --mount "type=bind,source=$(pwd),destination=/recipes" \ + --security-opt label=disable \ + godebos/debos recipe.yaml ``` ## Container build From 342f2634d4074ca1b58a02f7d32dc3d88b56ea3d Mon Sep 17 00:00:00 2001 From: Christopher Obbard Date: Thu, 26 Nov 2020 15:48:58 +0000 Subject: [PATCH 2/2] readme: Reword some of the usage and installation instructions Signed-off-by: Christopher Obbard --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6e1c08af..e6187846 100644 --- a/README.md +++ b/README.md @@ -57,14 +57,10 @@ https://godoc.org/github.com/go-debos/debos/actions ## Installation (Docker container) -Official debos container is available: -``` -docker pull godebos/debos -``` +A Docker container containing the latest version of Debos is available from [Docker Hub](https://hub.docker.com/r/godebos/debos). +See [docker/README.md](https://github.com/go-debos/debos/blob/master/docker/README.md) for more information and usage. -See [docker/README.md](https://github.com/go-debos/debos/blob/master/docker/README.md) for usage. - -## Installation (under Debian) +## Installation from source (under Debian) sudo apt install golang git libglib2.0-dev libostree-dev qemu-system-x86 \ qemu-user-static debootstrap systemd-container