From 23cfccf4243dd2adaa383782c64070952e662abe Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 23 Mar 2017 15:18:10 -0500 Subject: [PATCH] Remove unnecessary Linode-specific instructions Modern versions of Docker work just fine on Linode's default kernel thanks to the `overlay2` storage driver. Closes #2675 --- bootstrap.sh | 6 ------ docs/getting-started/install/linode.md | 28 -------------------------- docs/getting-started/installation.md | 1 - docs/home.html | 2 +- 4 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 docs/getting-started/install/linode.md diff --git a/bootstrap.sh b/bootstrap.sh index 087a4d424..ff7f29fcf 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -117,12 +117,6 @@ install-dokku-from-deb-package() { apt-get -qq -y install apt-transport-https echo "--> Installing docker" - if uname -r | grep -q linode; then - echo "--> NOTE: Using Linode? Docker might complain about missing AUFS support." - echo " See http://dokku.viewdocs.io/dokku/getting-started/install/linode/" - echo " Installation will continue in 10 seconds." - sleep 10 - fi wget -nv -O - https://get.docker.com/ | sh echo "--> Installing dokku" diff --git a/docs/getting-started/install/linode.md b/docs/getting-started/install/linode.md deleted file mode 100644 index 1fb3bcad9..000000000 --- a/docs/getting-started/install/linode.md +++ /dev/null @@ -1,28 +0,0 @@ -# Installing on Linode - -## Enable AUFS Storage Driver - -When installing Dokku on a newly-created Linode server, you'll likely see an error during Docker installation: - -> Warning: current kernel is not supported by the linux-image-extra-virtual package. We have no AUFS support. Consider installing the packages linux-image-virtual kernel and linux-image-extra-virtual for AUFS support. - -After 10 seconds, the installation will continue as normal. - -This warning is the result of Linode using its own kernel, which does not support AUFS, instead of using the kernel supplied by Debian/Ubuntu. If you ignore the warning, Docker will fall back to using the DeviceMapper storage backend and Dokku will work normally. However, AUFS is better tested and will perform better. - -To avoid this error message and use AUFS, follow the steps below to select the GRUB 2 kernel. - - -### Select the GRUB 2 kernel instead of the default Linode kernel: - -1. Login to your [Linode Manager](http://manager.linode.com), open the `Dashboard` associated with your new server. -2. Click `Edit` for the `Configuration Profile`. You should now be on the `Edit Configuration Profile` page. -3. Scroll down to `Boot Settings` > `Kernel menu`. Change the "Kernel" option to "GRUB 2" and save your changes. -4. If you have already pushed the `Boot` button and your server is running, you will need to reboot it before continuing. Otherwise, you can now push the `Boot` button to start your server and proceed with the normal Dokku installation. - -Once your server comes back online, you'll be running Ubuntu's default kernel. You can now follow Dokku's [normal installation instructions](/dokku/getting-started/installation/) and `bootstrap.sh` will take care of everything else. - - -### Verify that you are using AUFS: - -Once you have fully installed Dokku and rebooted your server, you can verify that AUFS is being used with the terminal command: `docker info`. If AUFS is being used, you should see `Storage Driver: aufs` in the output. diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md index 59186c832..90e528e3b 100644 --- a/docs/getting-started/installation.md +++ b/docs/getting-started/installation.md @@ -44,7 +44,6 @@ For various reasons, certain hosting providers may have other steps that should - [Digital Ocean Installation Notes](/dokku/getting-started/install/digitalocean) - [DreamHost Cloud Installation Notes](/dokku/getting-started/install/dreamhost/) -- [Linode Installation Notes](/dokku/getting-started/install/linode/) - [Microsoft Azure Installation Notes](/dokku/getting-started/install/azure/) As well, you may wish to customize your installation in some other fashion. or experiment with vagrant. The guides below should get you started: diff --git a/docs/home.html b/docs/home.html index dbdb65fee..251025939 100644 --- a/docs/home.html +++ b/docs/home.html @@ -173,7 +173,7 @@
-

Hate curl | bash? See our official Azure, DigitalOcean, DreamHost Cloud, and Linode instructions.

+

Hate curl | bash? See our official Azure, DigitalOcean, and DreamHost Cloud instructions.

Still no love? Contributions welcome!