diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 676b34324..27f0b7ac7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ on: jobs: build: name: build - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} strategy: @@ -41,7 +41,7 @@ jobs: unit-tests: name: unit.${{ matrix.index }} needs: build - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 strategy: fail-fast: false matrix: ${{fromJson(needs.build.outputs.matrix)}} @@ -78,7 +78,7 @@ jobs: docker-deploy-tests: name: docker needs: build - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 strategy: fail-fast: false @@ -103,7 +103,7 @@ jobs: go-tests: name: go.${{ matrix.index }} needs: build - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 strategy: fail-fast: false matrix: @@ -143,7 +143,7 @@ jobs: publish-test-results: name: publish-test-results needs: unit-tests - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 # the build-and-test job might be skipped, we don't need to run this job then if: success() || failure() diff --git a/README.md b/README.md index 4fc8e9fd0..00eba90d4 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Support us with a monthly donation and help us continue our activities. [[Become A fresh VM running any of the following operating systems: -- Ubuntu 16.04/18.04/20.04 x64 - Any currently supported release +- Ubuntu 18.04/20.04 x64 - Any currently supported release - Debian 9+ x64 - CentOS 7 x64 *(experimental)* - Arch Linux x64 *(experimental)* diff --git a/bootstrap.sh b/bootstrap.sh index 97a450da7..0842535a6 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/20.04, or CentOS 7 via 'sudo' +# It expects to be run on Ubuntu 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], Fedora (partial) [33, 34], Ubuntu [16.04, 18.04, 20.04]" +SUPPORTED_VERSIONS="Debian [9, 10], CentOS [7], Fedora (partial) [33, 34], Ubuntu [18.04, 20.04]" log-fail() { declare desc="log fail formatter" @@ -155,7 +155,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" "20.04" "9" "10"; then + if ! in-array "$DOKKU_DISTRO_VERSION" "18.04" "20.04" "9" "10"; then log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS" fi @@ -187,7 +187,7 @@ install-dokku-from-deb-package() { fi if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then - OS_IDS=("xenial" "bionic" "focal") + OS_IDS=("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 8e47c8512..b2959ec9b 100644 --- a/contrib/copy-packages +++ b/contrib/copy-packages @@ -16,7 +16,6 @@ def download_file(filename, url): def upload_file(filename): versions = [ - "xenial" "focal" ] cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}" diff --git a/contrib/release-dokku b/contrib/release-dokku index ca7b8bcfc..f229d1294 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" "focal") + OS_IDS=("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/docs/development/testing.md b/docs/development/testing.md index 76ef79e83..e146260e5 100644 --- a/docs/development/testing.md +++ b/docs/development/testing.md @@ -9,11 +9,11 @@ We maintain the Dokku test harness within the `tests` directory: ## Continuous Integration -All pull requests have tests run against them on [CircleCI](https://circleci.com/), a continuous integration platform that provides Docker support for Ubuntu Trusty 16.04. +All pull requests have tests run against them on [Github Actions](https://github.com/features/actions), a continuous integration platform that provides Docker support for Ubuntu Trusty 18.04. If you wish to skip tests for a particular commit, e.g. documentation changes, you may add the `[ci skip]` designator to your commit message. Commits that _should_ be tested but have the above designator will not be merged. -While we do provide official packages for a variety of platforms, as our test suite currently runs on Ubuntu Trusty 16.04, we only provide official installation support for that platform and the latest LTS release of Ubuntu (currently 18.04). +While we do provide official packages for a variety of platforms, as our test suite currently runs on Ubuntu Trusty 18.04, we only provide official installation support for that platform and the latest LTS release of Ubuntu (currently 20.04). ## Local Test Execution diff --git a/docs/getting-started/install/debian.md b/docs/getting-started/install/debian.md index f79762e9f..0acad0bbc 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 focal" | grep -q "$OS_ID" || OS_ID="bionic" +echo "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 -qq -y install dokku diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md index aba346d69..053d677a6 100644 --- a/docs/getting-started/installation.md +++ b/docs/getting-started/installation.md @@ -6,7 +6,7 @@ Dokku is an extensible, open source Platform as a Service that runs on a single To start using Dokku, you'll need a system that meets the following minimum requirements: -- A fresh installation of [Ubuntu 16.04/18.04/20.04 x64](https://www.ubuntu.com/download), [Debian 9+ x64](https://www.debian.org/distrib/) or [CentOS 7 x64](https://www.centos.org/download/) *(experimental)* with the FQDN set [1] +- A fresh installation of [Ubuntu 18.04/20.04 x64](https://www.ubuntu.com/download), [Debian 9+ x64](https://www.debian.org/distrib/) or [CentOS 7 x64](https://www.centos.org/download/) *(experimental)* with the FQDN set [1] - At least 1 GB of system memory [2] You can *optionally* have a domain name pointed at the host's IP, though this is not necessary. diff --git a/docs/home.html b/docs/home.html index 93367b92e..86612598f 100644 --- a/docs/home.html +++ b/docs/home.html @@ -140,7 +140,7 @@

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