Release 0.3.25

Revert "Remove `dokku plugins-install` from postinst hook"

HISTORY.md

@@ -1,5 +1,26 @@
 # History
 
+## 0.3.25
+
+This release is a bugfix release fixing a broken 0.3.25 apt-get installation.
+
+### Bug Fixes
+
+- #1398 @josegonzalez Revert "Remove `dokku plugins-install` from postinst hook
+
+## 0.3.24
+
+This release is a bugfix release covering dokku packaging.
+
+### Bug Fixes
+
+- #1397: @josegonzalez Use https docker apt repo
+- #1394: @josegonzalez Remove `dokku plugins-install` from postinst hook
+
+### Docs Changes
+
+- #1395: @adrianmoya Adding fqdn requirement
+
 ## 0.3.23
 
 This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://progrium.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!

Makefile

@@ -88,7 +88,7 @@ docker: aufs
 	usermod -aG docker dokku
 ifndef CI
 	curl -sSL https://get.docker.com/gpg | apt-key add -
-	echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
+	echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
 	apt-get update
 ifdef DOCKER_VERSION
 	apt-get install -qq -y lxc-docker-${DOCKER_VERSION}

README.md

@@ -10,8 +10,8 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S
 
 To install the latest stable release, you can run the following commands as a user that has access to `sudo`:
 
-    wget https://raw.github.com/progrium/dokku/v0.3.23/bootstrap.sh
+    wget https://raw.github.com/progrium/dokku/v0.3.25/bootstrap.sh
-    sudo DOKKU_TAG=v0.3.23 bash bootstrap.sh
+    sudo DOKKU_TAG=v0.3.25 bash bootstrap.sh
 
 ### Upgrading
 

bootstrap.sh

@@ -45,7 +45,7 @@ dokku_install_package() {
   curl -sSL https://get.docker.io/gpg | apt-key add -
   curl -sSL https://packagecloud.io/gpg.key | apt-key add -
 
-  echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
+  echo "deb https://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
   echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
 
   apt-get update > /dev/null

contrib/dokku-installer.rb

@@ -21,7 +21,7 @@ if ARGV[0] == "onboot"
   exit
 end
 
-version   = "v0.3.23"
+version   = "v0.3.25"
 dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
 admin_keys  = `cat /root/.ssh/authorized_keys`.split("\n")
 hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip

contrib/stackscript.sh

@@ -149,7 +149,7 @@ function install_prerequisites {
   sudo apt-get install -qq -y apt-transport-https > /dev/null 2>&1
 
   logit "Setting up apt repositories"
-  echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
+  echo "deb https://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
   echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
 
   logit "Running apt-get update"

deb.mk

@@ -40,7 +40,7 @@ install-from-deb:
 	curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null
 
 	echo "--> Setting up apt repositories"
-	echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
+	echo "deb https://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
 	echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
 
 	echo "--> Running apt-get update"

debian/control

@@ -5,6 +5,5 @@ Priority: optional
 Architecture: amd64
 Depends: locales, git, make, curl, software-properties-common, lxc-docker-1.6.2, gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook
 Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroup-lite
-Provides: dokku
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 Description: Docker powered mini-Heroku in around 100 lines of Bash

docs/getting-started/install/debian.md

@@ -6,7 +6,7 @@ As of 0.3.18, dokku defaults to being installed via debian package. While certai
 curl -sL https://get.docker.io/gpg 2> /dev/null | sudo apt-key add - 2>&1 >/dev/null
 curl -sL https://packagecloud.io/gpg.key 2> /dev/null | sudo apt-key add - 2>&1 >/dev/null
 
-echo "deb http://get.docker.io/ubuntu docker main" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
+echo "deb https://get.docker.io/ubuntu docker main" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
 echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list >/dev/null
 
 sudo apt-get update -qq

docs/home.html

@@ -64,12 +64,12 @@
           <p class="line">
             <span class="path">~</span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.github.com/progrium/dokku/v0.3.23/bootstrap.sh</span>
+            <span class="command">wget https://raw.github.com/progrium/dokku/v0.3.25/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path">~</span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.3.23 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.3.25 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>

docs/index.md

@@ -15,12 +15,12 @@
       <p class="line">
         <span class="path">~</span>
         <span class="prompt">$</span>
-        <span class="command">wget https://raw.github.com/progrium/dokku/v0.3.23/bootstrap.sh</span>
+        <span class="command">wget https://raw.github.com/progrium/dokku/v0.3.25/bootstrap.sh</span>
       </p>
       <p class="line">
         <span class="path">~</span>
         <span class="prompt">$</span>
-        <span class="command">sudo DOKKU_TAG=v0.3.23 bash bootstrap.sh</span>
+        <span class="command">sudo DOKKU_TAG=v0.3.25 bash bootstrap.sh</span>
       </p>
       <p class="line">
         <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>

docs/installation.md

@@ -4,8 +4,9 @@
 
 - A fresh VM running Ubuntu `14.04 x64`
 - At least `1GB` of system memory ([workaround for 512MB machines](http://progrium.viewdocs.io/dokku/advanced-installation))
+- The VM should have a FQDN set before installation (check by running `sudo hostname -f`).
 
-Ubuntu 14.04 x64 x64. Ideally have a domain ready to point to your host. It's designed for and is probably best to use a fresh VM. The bootstrapper will install everything it needs.
+Ubuntu 14.04 x64. Ideally have a domain ready to point to your host. It's designed for and is probably best to use a fresh VM. The bootstrapper will install everything it needs.
 
 ## Installing the latest Stable version
 
@@ -13,8 +14,8 @@ To install the latest stable version of dokku, you can run the following bootstr
 
 ```shell
 # installs dokku via apt-get
-wget https://raw.github.com/progrium/dokku/v0.3.23/bootstrap.sh
+wget https://raw.github.com/progrium/dokku/v0.3.25/bootstrap.sh
-sudo DOKKU_TAG=v0.3.23 bash bootstrap.sh
+sudo DOKKU_TAG=v0.3.25 bash bootstrap.sh
 
 # By default, this will do cli-based setup, though you may *also*
 # go to your server's IP and follow the web installer