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"