From 4136f0274a708e6f310e81ae9236d212b0f73cdb Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 6 May 2020 00:36:22 -0400 Subject: [PATCH 1/2] feat: add Ubuntu 20.04 support Will still need package releases, but everything should be ready for 0.21.0. Closes #3961 --- bootstrap.sh | 2 +- contrib/copy-packages | 1 + contrib/release-dokku | 2 +- contrib/release-dokku-update | 2 +- contrib/release-herokuish | 2 +- docs/getting-started/install/debian.md | 2 +- docs/home.html | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 04ce05853..05adb9256 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -172,7 +172,7 @@ install-dokku-from-deb-package() { fi if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then - OS_IDS=("xenial" "bionic") + OS_IDS=("xenial" "bionic" "focal") if ! in-array "$OS_ID" "${OS_IDS[@]}"; then OS_ID="bionic" fi diff --git a/contrib/copy-packages b/contrib/copy-packages index 760ae6d13..8e47c8512 100644 --- a/contrib/copy-packages +++ b/contrib/copy-packages @@ -17,6 +17,7 @@ def download_file(filename, url): def upload_file(filename): versions = [ "xenial" + "focal" ] cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}" for version in versions: diff --git a/contrib/release-dokku b/contrib/release-dokku index 7ea5edd77..6b3fce765 100755 --- a/contrib/release-dokku +++ b/contrib/release-dokku @@ -136,7 +136,7 @@ fn-publish-package() { [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7 if [[ "$DIST" == "ubuntu" ]]; then - OS_IDS=("xenial" "bionic") + OS_IDS=("xenial" "bionic" "focal") for OS_ID in "${OS_IDS[@]}"; do log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}" package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME" diff --git a/contrib/release-dokku-update b/contrib/release-dokku-update index 364dfc564..72471a0a4 100755 --- a/contrib/release-dokku-update +++ b/contrib/release-dokku-update @@ -61,7 +61,7 @@ fn-publish-package() { [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7 if [[ "$DIST" == "ubuntu" ]]; then - OS_IDS=("xenial" "bionic") + OS_IDS=("xenial" "bionic" "focal") for OS_ID in "${OS_IDS[@]}"; do log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}" package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME" diff --git a/contrib/release-herokuish b/contrib/release-herokuish index ba0121498..7e584b378 100755 --- a/contrib/release-herokuish +++ b/contrib/release-herokuish @@ -61,7 +61,7 @@ fn-publish-package() { [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7 if [[ "$DIST" == "ubuntu" ]]; then - OS_IDS=("xenial" "bionic") + OS_IDS=("xenial" "bionic" "focal") for OS_ID in "${OS_IDS[@]}"; do log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}" package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME" diff --git a/docs/getting-started/install/debian.md b/docs/getting-started/install/debian.md index ca5acd53a..c4f619011 100644 --- a/docs/getting-started/install/debian.md +++ b/docs/getting-started/install/debian.md @@ -13,7 +13,7 @@ wget -nv -O - https://get.docker.com/ | sh # install dokku wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add - OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")" -echo "xenial bionic" | grep -q "$OS_ID" || OS_ID="bionic" +echo "xenial bionic focal" | grep -q "$OS_ID" || OS_ID="bionic" echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ ${OS_ID} main" | sudo tee /etc/apt/sources.list.d/dokku.list sudo apt-get update -qq >/dev/null sudo apt-get install -qq -y dokku diff --git a/docs/home.html b/docs/home.html index b7f0463fc..c1354533b 100644 --- a/docs/home.html +++ b/docs/home.html @@ -169,7 +169,7 @@

$ - echo "xenial bionic" | grep -q "$OS_ID" || OS_ID="bionic" + echo "xenial bionic focal" | grep -q "$OS_ID" || OS_ID="bionic"

From b63a40d4fe9ca38949e1cae9395a8ddb904e0f23 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 8 May 2020 10:25:36 -0400 Subject: [PATCH 2/2] fix: add 20.04 to supported versions --- bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 05adb9256..0940f8686 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -3,7 +3,7 @@ set -eo pipefail [[ $TRACE ]] && set -x # A script to bootstrap dokku. -# It expects to be run on Ubuntu 16.04/18.04, or CentOS 7 via 'sudo' +# It expects to be run on Ubuntu 16.04/18.04/20.04, or CentOS 7 via 'sudo' # If installing a tag higher than 0.3.13, it may install dokku via a package (so long as the package is higher than 0.3.13) # It checks out the dokku source code from Github into ~/dokku and then runs 'make install' from dokku source. @@ -12,7 +12,7 @@ set -eo pipefail # That's good because it prevents our output overlapping with wget's. # It also means that we can't run a partially downloaded script. -SUPPORTED_VERSIONS="Debian [9, 10], CentOS [7], Ubuntu [16.04, 18.04]" +SUPPORTED_VERSIONS="Debian [9, 10], CentOS [7], Ubuntu [16.04, 18.04, 20.04]" log-fail() { declare desc="log fail formatter" @@ -141,7 +141,7 @@ install-dokku-from-deb-package() { local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""} local OS_ID - if ! in-array "$DOKKU_DISTRO_VERSION" "16.04" "18.04" "9" "10"; then + if ! in-array "$DOKKU_DISTRO_VERSION" "16.04" "18.04" "20.04" "9" "10"; then log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS" fi