From 7e990963f1249af5d6831e32ec2d830c8e289232 Mon Sep 17 00:00:00 2001
From: Robin Speekenbrink <robin@kingsquare.nl>
Date: Sat, 6 Oct 2018 01:27:29 +0200
Subject: [PATCH 1/2] Make sure the universe repo is loaded into APT

this should fix #3278
---
 bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index 0da17ab04..c8e28eafc 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,6 +32,7 @@ install-requirements() {
 
   case "$DOKKU_DISTRO" in
     debian|ubuntu)
+      add-apt-repository universe > /dev/null
       apt-get update -qq > /dev/null
       ;;
   esac

From 51add20a534faa7418d786bc3a4ba284911e7792 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 6 Jan 2019 20:49:08 -0500
Subject: [PATCH 2/2] fix: ensure software-properties-common is installed

It is necessary for add-apt-repository
---
 bootstrap.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index c8e28eafc..35aab6126 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,6 +32,11 @@ install-requirements() {
 
   case "$DOKKU_DISTRO" in
     debian|ubuntu)
+      if ! dpkg -l | grep -q software-properties-common; then
+        apt-get update -qq > /dev/null
+        apt-get -qq -y install software-properties-common
+      fi
+
       add-apt-repository universe > /dev/null
       apt-get update -qq > /dev/null
       ;;