Merge pull request kata-containers#424 from jcvenegas/master

install: Allow define kata branch.
Remy-xl · Apr 9, 2019 · 4470e32 · 4470e32
2 parents 2ee437f + 9f12577
commit 4470e32
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/install/centos-installation-guide.md b/install/centos-installation-guide.md
@@ -6,7 +6,8 @@
    $ source /etc/os-release
    $ sudo yum -y install yum-utils
    $ ARCH=$(arch)
-   $ sudo -E yum-config-manager --add-repo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/CentOS_${VERSION_ID}/home:katacontainers:releases:${ARCH}:master.repo"
+   $ BRANCH="${BRANCH:-master}"
+   $ sudo -E yum-config-manager --add-repo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/CentOS_${VERSION_ID}/home:katacontainers:releases:${ARCH}:${BRANCH}.repo"
    $ sudo -E yum -y install kata-runtime kata-proxy kata-shim
    ```
 

diff --git a/install/debian-installation-guide.md b/install/debian-installation-guide.md
@@ -32,12 +32,13 @@
    ```bash
    $ export DEBIAN_FRONTEND=noninteractive
    $ ARCH=$(arch)
+   $ BRANCH="${BRANCH:-master}"
    $ source /etc/os-release
    $ [ "$ID" = debian ] && [ -z "$VERSION_ID" ] && echo >&2 "ERROR: Debian unstable not supported.
      You can try stable packages here:
-     http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master" && exit 1
-   $ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/Debian_${VERSION_ID}/ /' > /etc/apt/sources.list.d/kata-containers.list"
-   $ curl -sL  http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/Debian_${VERSION_ID}/Release.key | sudo apt-key add -
+     http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}" && exit 1
+   $ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/Debian_${VERSION_ID}/ /' > /etc/apt/sources.list.d/kata-containers.list"
+   $ curl -sL  http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/Debian_${VERSION_ID}/Release.key | sudo apt-key add -
    $ sudo -E apt-get update
    $ sudo -E apt-get -y install kata-runtime kata-proxy kata-shim
    ```

diff --git a/install/fedora-installation-guide.md b/install/fedora-installation-guide.md
@@ -5,8 +5,9 @@
    ```bash
    $ source /etc/os-release
    $ ARCH=$(arch)
+   $ BRANCH="${BRANCH:-master}"
    $ sudo dnf -y install dnf-plugins-core
-   $ sudo -E dnf config-manager --add-repo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/Fedora_${VERSION_ID}/home:katacontainers:releases:${ARCH}:master.repo"
+   $ sudo -E dnf config-manager --add-repo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/Fedora_${VERSION_ID}/home:katacontainers:releases:${ARCH}:${BRANCH}.repo"
    $ sudo -E dnf -y install kata-runtime kata-proxy kata-shim
    ```
 

diff --git a/install/opensuse-installation-guide.md b/install/opensuse-installation-guide.md
@@ -5,7 +5,8 @@
    ```bash
    $ source /etc/os-release
    $ ARCH=$(arch)
-   $ sudo -E zypper addrepo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/openSUSE_Leap_${VERSION_ID}/home:katacontainers:releases:${ARCH}:master.repo"
+   $ BRANCH="${BRANCH:-master}"
+   $ sudo -E zypper addrepo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/openSUSE_Leap_${VERSION_ID}/home:katacontainers:releases:${ARCH}:${BRANCH}.repo"
    $ sudo -E zypper -n --no-gpg-checks install kata-runtime kata-proxy kata-shim
    ```
 

diff --git a/install/rhel-installation-guide.md b/install/rhel-installation-guide.md
@@ -13,7 +13,8 @@
    ```bash
    $ source /etc/os-release
    $ ARCH=$(arch)
-   $ sudo -E yum-config-manager --add-repo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/RHEL_${VERSION_ID}/home:katacontainers:releases:${ARCH}:master.repo"
+   $ BRANCH="${BRANCH:-master}"
+   $ sudo -E yum-config-manager --add-repo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/RHEL_${VERSION_ID}/home:katacontainers:releases:${ARCH}:${BRANCH}.repo"
    $ sudo -E yum -y install kata-runtime kata-proxy kata-shim
    ```
 

diff --git a/install/sles-installation-guide.md b/install/sles-installation-guide.md
@@ -12,7 +12,8 @@
 
    ```bash
    $ ARCH=$(arch)
-   $ sudo -E zypper addrepo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/SLE_12_SP3/home:katacontainers:releases:${ARCH}:master.repo"
+   $ BRANCH="${BRANCH:-master}"
+   $ sudo -E zypper addrepo "http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/SLE_12_SP3/home:katacontainers:releases:${ARCH}:${BRANCH}.repo"
    $ sudo -E zypper -n --no-gpg-checks install kata-runtime kata-proxy kata-shim
    ```
 

diff --git a/install/ubuntu-installation-guide.md b/install/ubuntu-installation-guide.md
@@ -3,8 +3,9 @@
 1. Install the Kata Containers components with the following commands:
    ```bash
    $ ARCH=$(arch)
-   $ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/xUbuntu_$(lsb_release -rs)/ /' > /etc/apt/sources.list.d/kata-containers.list"
-   $ curl -sL  http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/master/xUbuntu_$(lsb_release -rs)/Release.key | sudo apt-key add -
+   $ BRANCH="${BRANCH:-master}"
+   $ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/xUbuntu_$(lsb_release -rs)/ /' > /etc/apt/sources.list.d/kata-containers.list"
+   $ curl -sL  http://download.opensuse.org/repositories/home:/katacontainers:/releases:/${ARCH}:/${BRANCH}/xUbuntu_$(lsb_release -rs)/Release.key | sudo apt-key add -
    $ sudo -E apt-get update
    $ sudo -E apt-get -y install kata-runtime kata-proxy kata-shim
    ```