From e717a59174fde8679f126e6c4a006c5a85ceb3e0 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com> Date: Sun, 22 Nov 2020 17:07:25 +0100 Subject: [PATCH 1/3] Update install.md --- install.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/install.md b/install.md index 18fb3e12..1823eeba 100644 --- a/install.md +++ b/install.md @@ -81,18 +81,6 @@ are available via the [Kubic][0] project repositories: [0]: https://build.opensuse.org/project/show/devel:kubic:libcontainers:stable -```bash -# Debian Unstable/Sid: -echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Unstable/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list -curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Unstable/Release.key | sudo apt-key add - -``` - -```bash -# Debian Testing: -echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Testing/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list -curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Testing/Release.key | sudo apt-key add - -``` - ```bash # Debian 10: echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list From 2ec251c2e2dde5de791ce201626faf709baa9b96 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 24 Nov 2020 08:27:46 -0500 Subject: [PATCH 2/3] Update installation docs for debian and ubuntu Continuation of Michael R. Crusoe's pr#1115. Co-authored-by: Tom Sweeney Signed-off-by: Lokesh Mandvekar --- install.md | 89 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 21 deletions(-) diff --git a/install.md b/install.md index 1823eeba..451056c9 100644 --- a/install.md +++ b/install.md @@ -75,36 +75,83 @@ brew install skopeo $ nix-env -i skopeo ``` -### Debian ≥ 10 and Ubuntu ≥ 18.04 -Debian (10 and newer including Raspbian) and Ubuntu (18.04 and newer): Packages -are available via the [Kubic][0] project repositories: +### Debian -[0]: https://build.opensuse.org/project/show/devel:kubic:libcontainers:stable +The skopeo package is available in the [Bullseye (testing) +branch](https://packages.debian.org/bullseye/podman), which will be the +next stable release (Debian 11) as well as the Debian Unstable/Sid. ```bash -# Debian 10: +# Debian Testing/Bullseye or Unstable/Sid +sudo apt-get update +sudo apt-get -y install skopeo +``` + +The [Kubic project](https://build.opensuse.org/project/show/devel:kubic:libcontainers:stable) +provides packages for Debian 10. The Kubic packages for Debian Testing/Bullseye and Debian Unstable/Sid +have been discontinued to avoid +[conflicts](https://github.com/containers/buildah/issues/2797) with the official packages. + +Caution: If you upgrade from Debian 10 to Testing/Bullseye or +Unstable/Sid you would likely end up downgrading Skopeo because the version in +OBS is more frequently updated than the one in Debian's official repositories, +due to how Debian works. + +```bash +# Debian 10 echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/Release.key | sudo apt-key add - -``` - -```bash -# Raspbian 10: -echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Raspbian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list -curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Raspbian_10/Release.key | sudo apt-key add - -``` - -```bash -# Ubuntu (18.04, 19.04, 19.10 and 20.04): -. /etc/os-release -sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" -curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/Release.key | sudo apt-key add - -``` - -```bash sudo apt-get -y update sudo apt-get -y install skopeo ``` +### Raspberry Pi OS armhf (ex Raspbian) + +The Kubic project provides packages for Raspbian 10. + +```bash +# Raspbian 10 +echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Raspbian_10/ /' | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list +curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Raspbian_10/Release.key | sudo apt-key add - +sudo apt-get update -qq +sudo apt-get -qq -y install skopeo +``` + + +### Raspberry Pi OS arm64 (beta) + +Raspberry Pi OS uses the standard Debian's repositories, +so it is fully compatible with Debian's arm64 repository. +You can simply follow the [steps for Debian](#debian) to install podman. + + +### Ubuntu + +The skopeo package is available in the official repositories for Ubuntu 20.10 +and newer. + +```bash +# Ubuntu 20.10 and newer +sudo apt-get -y update +sudo apt-get -y install skopeo +``` + +The Kubic project provides packages for some older Ubuntu versions +Checkout the [Kubic project page](https://build.opensuse.org/package/show/devel:kubic:libcontainers:stable/skopeo) +for a list of supported Ubuntu version and +architecture combinations. **NOTE:** The command `sudo apt-get -y upgrade` +maybe required in some cases if Skopeo cannot be installed without it. + +```bash +. /etc/os-release +echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list +curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add - +sudo apt-get update +sudo apt-get -y upgrade +sudo apt-get -y install skopeo +``` + + Otherwise, read on for building and installing it from source: To build the `skopeo` binary you need at least Go 1.12. From 4597c09522c607ccef12d10c5a1eba948a18e77b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 24 Nov 2020 13:41:49 -0500 Subject: [PATCH 3/3] update OSX Travis env before running tests Signed-off-by: Lokesh Mandvekar --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 204ef8e0..7a2f6671 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,6 +64,7 @@ jobs: # since the last OS image build (as of July 2020), but the Travis OS still # contains it, and it prevents updating of Python 3. - brew update && brew unlink python@2 && brew install gpgme + - sudo rm -rf /Library/Developer/CommandLineTools && sudo xcode-select --install script: - hack/travis_osx.sh - stage: local-build