fix: always reference trusty as default
It is currently where we run CI, so I trust - heh - that as a default more than anything else
This commit is contained in:
1 parent
83c39cee30
commit
8cec6ee318
1 file changed
+4
-4
+4
-4
@@ -145,21 +145,21 @@ install-dokku-from-deb-package() {
|
|||||||
add-apt-repository -y ppa:nginx/stable
|
add-apt-repository -y ppa:nginx/stable
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OS_ID="$(lsb_release -cs 2> /dev/null || echo "xenial")"
|
OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
|
||||||
if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu"; then
|
if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu"; then
|
||||||
DOKKU_DISTRO="ubuntu"
|
DOKKU_DISTRO="ubuntu"
|
||||||
OS_ID="xenial"
|
OS_ID="trusty"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
|
if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
|
||||||
OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
|
OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
|
||||||
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
|
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
|
||||||
OS_ID="xenial"
|
OS_ID="trusty"
|
||||||
fi
|
fi
|
||||||
elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
|
elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
|
||||||
OS_IDS=("wheezy" "jessie" "stretch" "buster" "bullseye")
|
OS_IDS=("wheezy" "jessie" "stretch" "buster" "bullseye")
|
||||||
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
|
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
|
||||||
OS_ID="xenial"
|
OS_ID="stretch"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user