Merge pull request #7981 from dokku/7980-software-properties-common
fix: only install software-properties-common on Ubuntu and older Debian installations
This commit is contained in:
17
bootstrap.sh
17
bootstrap.sh
@@ -128,7 +128,22 @@ install-dokku-from-source() {
|
|||||||
log-fail "This installation script requires apt-get. For manual installation instructions, consult https://dokku.com/docs/getting-started/advanced-installation/"
|
log-fail "This installation script requires apt-get. For manual installation instructions, consult https://dokku.com/docs/getting-started/advanced-installation/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
apt-get -qq -y --no-install-recommends install sudo git make software-properties-common
|
apt-get -qq -y --no-install-recommends install sudo git make
|
||||||
|
case "$DOKKU_DISTRO" in
|
||||||
|
debian)
|
||||||
|
if [[ "$DOKKU_DISTRO_VERSION" -lt "13" ]]; then
|
||||||
|
if ! dpkg -l | grep -q software-properties-common; then
|
||||||
|
apt-get -qq -y --no-install-recommends install software-properties-common
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
ubuntu)
|
||||||
|
if ! dpkg -l | grep -q software-properties-common; then
|
||||||
|
apt-get -qq -y --no-install-recommends install software-properties-common
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
cd /root
|
cd /root
|
||||||
if [[ ! -d /root/dokku ]]; then
|
if [[ ! -d /root/dokku ]]; then
|
||||||
git clone "$DOKKU_REPO" /root/dokku
|
git clone "$DOKKU_REPO" /root/dokku
|
||||||
|
|||||||
Reference in New Issue
Block a user