From 0d370a285b09bd28c5b1cdfc6b89d2997f67da5d Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 15 May 2019 14:07:43 +0000
Subject: [PATCH] Pin skopeo to unbreak skopeo+bubblewrap
Pin skopeo back to 0.1.36-1~dev~ubuntu16.04.2~ppa14 which is before
the code that changed the required capabilities, breaking the use of
skopeo from inside of bubblewrap.
Change-Id: Ibf3000d87772d02b7325315cfeed078716e0d7bf
---
manifests/site.pp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index 72cd70e000..a12c9dd085 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -773,7 +773,10 @@ node /^ze\d+\.open.*\.org$/ {
apt::ppa { 'ppa:projectatomic/ppa': }
package { 'skopeo':
- ensure => present,
+ # Pin skopeo back to 0.1.36-1~dev~ubuntu16.04.2~ppa14 which is before
+ # the code that changed the required capabilities, breaking the use of
+ # skopeo from inside of bubblewrap.
+ ensure => '0.1.36-1~dev~ubuntu16.04.2~ppa14',
require => [
Apt::Ppa['ppa:projectatomic/ppa'],
Class['apt::update'],