From e6ec193415cf42ee5e39ebbc4bf41fd5a0143bb1 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 11 Apr 2017 16:37:10 +0100 Subject: [PATCH 1/3] docs: Use latest clear containers repo for latest distros. Use Clear Containers 2.1 kernel (not Clear Containers 2.0) for latest distro versions. Signed-off-by: James O. D. Hunt --- hack/virtc/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/virtc/README.md b/hack/virtc/README.md index bd30ad23..ec0b1178 100644 --- a/hack/virtc/README.md +++ b/hack/virtc/README.md @@ -13,13 +13,13 @@ Here we explain how to use the pod and container API from `virtc` command line. _Fedora_ ``` -$ sudo -E dnf config-manager --add-repo http://download.opensuse.org/repositories/home:clearlinux:preview:clear-containers-2.0/Fedora_24/home:clearlinux:preview:clear-containers-2.0.repo +$ sudo -E dnf config-manager --add-repo http://download.opensuse.org/repositories/home:clearlinux:preview:clear-containers-2.1/Fedora_25/home:clearlinux:preview:clear-containers-2.1.repo $ sudo dnf install linux-container ``` _Ubuntu_ ``` -$ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/clearlinux:/preview:/clear-containers-2.0/xUbuntu_16.04/ /' >> /etc/apt/sources.list.d/cc-oci-runtime.list" +$ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/clearlinux:/preview:/clear-containers-2.1/xUbuntu_16.10/ /' >> /etc/apt/sources.list.d/cc-oci-runtime.list" $ sudo apt install linux-container ``` From cc9656ee2ab2318661598daf4a959fc6da36e34b Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 11 Apr 2017 16:38:03 +0100 Subject: [PATCH 2/3] docs: Improve Clear Containers image download details. Ensure the user always downloads the latest image. This avoids us hard-coding what will very quickly become an out-of-date image. Signed-off-by: James O. D. Hunt --- hack/virtc/README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hack/virtc/README.md b/hack/virtc/README.md index ec0b1178..3100fc2a 100644 --- a/hack/virtc/README.md +++ b/hack/virtc/README.md @@ -26,12 +26,16 @@ $ sudo apt install linux-container #### Get your image Retrieve a recent Clear Containers image to make sure it contains a recent version of hyperstart agent. -You can dowload the following tested [image](https://download.clearlinux.org/releases/14230/clear/clear-14230-containers.img.xz), or any version more recent. + +To download and install the latest image: ``` -$ wget https://download.clearlinux.org/releases/14230/clear/clear-14230-containers.img.xz -$ unxz clear-14230-containers.img.xz -$ sudo cp clear-14230-containers.img /usr/share/clear-containers/clear-containers.img +$ latest_version=$(curl -sL https://download.clearlinux.org/latest) +$ curl -LO "https://download.clearlinux.org/current/clear-${latest_version}-containers.img.xz" +$ unxz clear-${latest_version}-containers.img.xz +$ sudo mkdir -p /usr/share/clear-containers/ +$ sudo install --owner root --group root --mode 0644 clear-${latest_version}-containers.img /usr/share/clear-containers/ +$ sudo ln -fs /usr/share/clear-containers/clear-${latest_version}-containers.img /usr/share/clear-containers/clear-containers.img ``` #### Get virtc From bb41d463f65346356a25249e78880f012cfe584a Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 11 Apr 2017 16:38:53 +0100 Subject: [PATCH 3/3] docs: Simplify call to "virtcontainers-setup.sh". Call "virtcontainers-setup.sh" without using the intermediate and reduntant su(1). Signed-off-by: James O. D. Hunt --- hack/virtc/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hack/virtc/README.md b/hack/virtc/README.md index 3100fc2a..e2629372 100644 --- a/hack/virtc/README.md +++ b/hack/virtc/README.md @@ -49,8 +49,7 @@ _Build and setup your environment_ ``` $ cd $GOPATH/src/github.com/containers/virtcontainers $ go build -o virtc hack/virtc/main.go -$ sudo su -# ./utils/virtcontainers-setup.sh +$ sudo ./utils/virtcontainers-setup.sh ``` `virtcontainers-setup.sh` setup your environment performing different tasks. Particularly, it creates a __busybox__ bundle, and it creates CNI configuration files needed to run `virtc` with CNI plugins.