Merge pull request #3967 from dokku/3961-focal-support
Add Ubuntu 20.04 support
This commit is contained in:
@@ -3,7 +3,7 @@ set -eo pipefail
|
|||||||
[[ $TRACE ]] && set -x
|
[[ $TRACE ]] && set -x
|
||||||
|
|
||||||
# A script to bootstrap dokku.
|
# 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)
|
# 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.
|
# 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.
|
# That's good because it prevents our output overlapping with wget's.
|
||||||
# It also means that we can't run a partially downloaded script.
|
# 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() {
|
log-fail() {
|
||||||
declare desc="log fail formatter"
|
declare desc="log fail formatter"
|
||||||
@@ -141,7 +141,7 @@ install-dokku-from-deb-package() {
|
|||||||
local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""}
|
local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""}
|
||||||
local OS_ID
|
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"
|
log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -172,7 +172,7 @@ install-dokku-from-deb-package() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
|
if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
|
||||||
OS_IDS=("xenial" "bionic")
|
OS_IDS=("xenial" "bionic" "focal")
|
||||||
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
|
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
|
||||||
OS_ID="bionic"
|
OS_ID="bionic"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ def download_file(filename, url):
|
|||||||
def upload_file(filename):
|
def upload_file(filename):
|
||||||
versions = [
|
versions = [
|
||||||
"xenial"
|
"xenial"
|
||||||
|
"focal"
|
||||||
]
|
]
|
||||||
cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}"
|
cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}"
|
||||||
for version in versions:
|
for version in versions:
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ fn-publish-package() {
|
|||||||
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
||||||
|
|
||||||
if [[ "$DIST" == "ubuntu" ]]; then
|
if [[ "$DIST" == "ubuntu" ]]; then
|
||||||
OS_IDS=("xenial" "bionic")
|
OS_IDS=("xenial" "bionic" "focal")
|
||||||
for OS_ID in "${OS_IDS[@]}"; do
|
for OS_ID in "${OS_IDS[@]}"; do
|
||||||
log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
||||||
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ fn-publish-package() {
|
|||||||
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
||||||
|
|
||||||
if [[ "$DIST" == "ubuntu" ]]; then
|
if [[ "$DIST" == "ubuntu" ]]; then
|
||||||
OS_IDS=("xenial" "bionic")
|
OS_IDS=("xenial" "bionic" "focal")
|
||||||
for OS_ID in "${OS_IDS[@]}"; do
|
for OS_ID in "${OS_IDS[@]}"; do
|
||||||
log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
||||||
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ fn-publish-package() {
|
|||||||
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
||||||
|
|
||||||
if [[ "$DIST" == "ubuntu" ]]; then
|
if [[ "$DIST" == "ubuntu" ]]; then
|
||||||
OS_IDS=("xenial" "bionic")
|
OS_IDS=("xenial" "bionic" "focal")
|
||||||
for OS_ID in "${OS_IDS[@]}"; do
|
for OS_ID in "${OS_IDS[@]}"; do
|
||||||
log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
||||||
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ wget -nv -O - https://get.docker.com/ | sh
|
|||||||
# install dokku
|
# install dokku
|
||||||
wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
|
wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
|
||||||
OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")"
|
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
|
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 update -qq >/dev/null
|
||||||
sudo apt-get install -qq -y dokku
|
sudo apt-get install -qq -y dokku
|
||||||
|
|||||||
@@ -169,7 +169,7 @@
|
|||||||
<p class="line">
|
<p class="line">
|
||||||
<span class="path"></span>
|
<span class="path"></span>
|
||||||
<span class="prompt">$</span>
|
<span class="prompt">$</span>
|
||||||
<span class="command">echo "xenial bionic" | grep -q "$OS_ID" || OS_ID="bionic"</span>
|
<span class="command">echo "xenial bionic focal" | grep -q "$OS_ID" || OS_ID="bionic"</span>
|
||||||
</p>
|
</p>
|
||||||
<p class="line">
|
<p class="line">
|
||||||
<span class="path"></span>
|
<span class="path"></span>
|
||||||
|
|||||||
Reference in New Issue
Block a user