Release 0.4.13

Merge pull request #1872 from kenips/support/better_logs_for_checks
Update log to better reflect what's going on with CHECKS
2016-01-20 22:59:29 -05:00 · 2016-01-18 17:48:22 -08:00 · 2016-01-18 19:35:47 -05:00 · 2016-01-17 22:01:33 -08:00 · 2016-01-17 18:29:49 -08:00 · 2016-01-16 17:21:44 -05:00
37 changed files with 297 additions and 214 deletions
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,56 @@
 # History

+## 0.4.13
+
+We lied. *This* is the final 0.4.x release. This specific release fixes support for bash `4.2`, which may be the only bash version available for certain testing environments.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1871: @michaelshobbs Support bash 4.2 so we don't have to modify all plugin test envs
+- #1872: @kenips Update log to better reflect what's going on with CHECKS
+
+## 0.4.12
+
+This is a small bugfix release, which will be the final release before the 0.5.x line. You can follow along on bugs/features we hope to cleanup for 0.5.x [here](https://github.com/dokku/dokku/milestones/v0.5.0).
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1868: @alessio Prevent dokku to hang on events:help
+- #1870: @u2mejc Remove arg check from docker-options/functions, global var cleanup
+
+## 0.4.11
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1840: @alessio Append trailing slash '/' to $PLUGIN_DIR
+- #1841: @michaelshobbs Don't build nginx config if the app has not been deployed
+- #1844: @michaelshobbs Handle multiple old containers and don't attempt to rename a dead container
+- #1845: @michaelshobbs Update nodejs in test apps
+- #1849: @floriangosse Fix logrotate file for debian system
+- #1862: @michaelshobbs Install bash 4.3.x on circleci
+- #1863: @znz Fix a typo in IPV6 detection
+
+### New Features
+
+- #1842: @michaelshobbs skip cleanup in ci to speed up tests
+- #1848: @u2mejc Move docker-options functions to functions file, rework phase_file_path
+- #1855: @jvanbaarsen Add skip_keyfile option for deb package
+- #1864: @znz Remove nullglob from ps commands
+
+### Documentation
+
+- #1838: @Epigene Fixed typo in installation documentation
+- #1843: @sseemayer Move let's encrypt plugin to official plugins
+- #1854: @fedosov Update year in footer (2013-2016)
+- #1856: @madflow Fixed dead documentation link
+- #1859: @dhinus Fix command for debconf-set-selections
+
 ## 0.4.10

 This release is mostly a bugfix release, though we have a few important changes:
@@ -22,8 +73,8 @@ Thanks to all the contributors who helped with this release!
 ### New Features

 - #1826: @michaelshobbs Implement plugn update
- #1829: @michaelshobbs Implement dokku report command
 - #1828: @michaelshobbs Label all dokku-managed containers
+- #1829: @michaelshobbs Implement dokku report command

 ### Documentation

--- a/README.md
+++ b/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.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh
-    sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh
+    wget https://raw.githubusercontent.com/dokku/dokku/v0.4.13/bootstrap.sh
+    sudo DOKKU_TAG=v0.4.13 bash bootstrap.sh

 ### Upgrading

--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 machine:
  pre:
-    - echo 'DOCKER_OPTS="-s btrfs -e lxc -D --userland-proxy=false"' | sudo tee -a /etc/default/docker
+    - echo 'DOCKER_OPTS="-s btrfs -e lxc --userland-proxy=false"' | sudo tee -a /etc/default/docker
    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci-cp-workaround'
    - sudo chmod 0755 /usr/bin/docker
  services:
@@ -10,6 +10,7 @@ dependencies:
    - "~/docker"
  override:
    - ./tests/ci/parallel_runner.sh setup: { timeout: 300 }
+    - echo "export DOKKU_SKIP_CLEANUP=true" > /home/dokku/.dokkurc/dokku_skip_cleanup
  post:
    - sudo -E make -e lint
 test:
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -9,7 +9,7 @@ import subprocess
 import sys
 import threading

-VERSION = 'v0.4.10'
+VERSION = 'v0.4.13'

 hostname = ''
 try:
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.4.10
+Version: 0.4.13
 Section: web
 Priority: optional
 Architecture: amd64
--- a/debian/preinst
+++ b/debian/preinst
@@ -27,7 +27,8 @@ case "$1" in
      exit 0
    fi

-    if [ -z "${DEBCONF_RECONFIGURE}" ]; then
+    db_get "dokku/skip_key_file"
+    if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then
      db_get "dokku/key_file"
      if [ ! -f "$RET" ]; then
          echo "Error: keyfile '$RET' not found."
--- a/debian/templates
+++ b/debian/templates
@@ -13,6 +13,11 @@ Description: Hostname or IP for server:
 Type: string
 Default: dokku.me

+Template: dokku/skip_key_file
+Description: Skip key file requirement?
+Type: boolean
+Default: false
+
 Template: dokku/key_file
 Description: Keyfile for initial user:
 Type: string
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
  <msapplication>
    <tile>
-      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/mstile-310x150.png"/>
      <TileColor>#da532c</TileColor>
    </tile>
  </msapplication>
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
    "name": "Dokku",
    "icons": [
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.13\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.13\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.13\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.13\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.13\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.13\/docs\/assets\/favicons\/android-chrome-192x192.png",
            "sizes": "192x192",
            "type": "image\/png",
            "density": "4.0"
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -25,7 +25,7 @@ h1 {
  padding: 0 0 0 1em;
 }
 .header a {
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/dokku.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/dokku.png);
  color: #fff;
  text-indent: 40px;
  background-position: center left;
@@ -40,7 +40,7 @@ h1 {
 .blurb {
  color: #424242;
  background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/docker-options.md
+++ b/docs/docker-options.md
@@ -2,7 +2,7 @@

 > New as of 0.3.17

-Pass [options](http://docs.docker.io/en/latest/reference/run/) to Docker during Dokku's `build`, `deploy` and `run` phases
+Pass [options](https://docs.docker.com/engine/reference/run/) to Docker during Dokku's `build`, `deploy` and `run` phases

 ```
 docker-options <app>                             Display app's Docker options for all phases
--- a/docs/getting-started/install/debian.md
+++ b/docs/getting-started/install/debian.md
@@ -25,7 +25,7 @@ In case you want to perform an unattended installation of dokku, this is made po
 You can set any of the below options through the `debconf-set-selections` command, for example to enable vhost-based deployments:

 ```bash
-sudo echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
+echo "dokku dokku/vhost_enable boolean true" | sudo debconf-set-selections
 ```

 After setting the desired options, proceed with the installation as described above.
@@ -37,4 +37,5 @@ After setting the desired options, proceed with the installation as described ab
 | dokku/web_config   | boolean | true                  | Use web-based config for below options                                   |
 | dokku/vhost_enable | boolean | false                 | Use vhost-based deployments (e.g. <app>.dokku.me)                        |
 | dokku/hostname     | string  | dokku.me              | Hostname, used as vhost domain and for showing app URL after deploy      |
+| dokku/skip_key_file| boolean | false                 | Don't check for the existence of the dokku/key_file. Warning: This setting this to true, will require you to manually add an SSH key later on. |
 | dokku/key_file     | string  | /root/.ssh/id_rsa.pub | SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,26 +10,26 @@
    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
    <title>Dokku - The smallest PaaS implementation you've ever seen</title>

-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon.ico">
    <meta name="apple-mobile-web-app-title" content="Dokku">
    <meta name="application-name" content="Dokku">
    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
@@ -87,12 +87,12 @@
          <p class="line">
            <span class="path">~</span>
            <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.13/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path">~</span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.4.13 bash bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>
@@ -144,7 +144,7 @@
    <div class="container">
      <footer>
        <p class="pull-right"><a href="#">Back to top</a></p>
-        <p>&copy; 2013 Dokku</p>
+        <p>&copy; 2013-2016 Dokku</p>
      </footer>
    </div>
  </body>
--- a/docs/index.md
+++ b/docs/index.md
@@ -15,12 +15,12 @@
      <p class="line">
        <span class="path">~</span>
        <span class="prompt">$</span>
-        <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh</span>
+        <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.13/bootstrap.sh</span>
      </p>
      <p class="line">
        <span class="path">~</span>
        <span class="prompt">$</span>
-        <span class="command">sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh</span>
+        <span class="command">sudo DOKKU_TAG=v0.4.13 bash bootstrap.sh</span>
      </p>
      <p class="line">
        <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -4,7 +4,7 @@

 Dokku is an extensible, open source Platform as a Service that runs on a single server of your choice.

-To start using Dokku, you'll need a system with that meets the following minimum requirements:
+To start using Dokku, you'll need a system that meets the following minimum requirements:

 - A fresh installation of [Ubuntu 14.04 x64](http://www.ubuntu.com/download/) with the FQDN set <sup>[1]</sup>
 - At least `1GB` of system memory <sup>[2]</sup>
@@ -19,8 +19,8 @@ To install the latest stable version of dokku, you can run the following shell c

 ```shell
 # installs dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh
-sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.4.13/bootstrap.sh
+sudo DOKKU_TAG=v0.4.13 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -47,6 +47,7 @@ The following plugins are available and provided by dokku maintainers. Where not
 | [RethinkDB (beta)](https://github.com/dokku/dokku-rethinkdb-plugin)                               | [dokku][]             | 0.4.0+                |
 | [Copy Files to Image](https://github.com/dokku/dokku-copyfiles-to-image)                          | [dokku][]             | 0.4.0+                |
 | [HTTP Auth (beta)](https://github.com/dokku/dokku-http-auth)                                      | [dokku][]             | 0.4.0+                |
+| [Let's Encrypt (beta)](https://github.com/dokku/dokku-letsencrypt)                                | [dokku][]             | 0.4.0+                |
 | [Maintenance mode (beta)](https://github.com/dokku/dokku-maintenance)                             | [dokku][]             | 0.4.0+                |
 | [Redirect (beta)](https://github.com/dokku/dokku-redirect)                                        | [dokku][]             | 0.4.0+                |

@@ -185,7 +186,6 @@ Note: The following plugins have been supplied by our community and may not have
 | [Haproxy tcp load balancer](https://github.com/256dpi/dokku-haproxy)                              | [256dpi][]            | 0.4.0+                |
 | [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
-| [Lets Encrypt](https://github.com/sseemayer/dokku-letsencrypt)                                    | [sseemayer][]         | 0.4.0+                |
 | [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           |                       |
 | [Nuke Containers](https://github.com/heichblatt/dokku-nuke)                                       | [heichblatt][]        |                       |
 | [Open App Ports](https://github.com/heichblatt/dokku-ports)                                       | [heichblatt][]        |                       |
--- a/docs/template.html
+++ b/docs/template.html
@@ -10,30 +10,30 @@
    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400:sans-serif|Open+Sans:400:sans-serif" rel="stylesheet" type="text/css">
    <title>Dokku - The smallest PaaS implementation you've ever seen</title>

-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/favicon.ico">
    <meta name="apple-mobile-web-app-title" content="Dokku">
    <meta name="application-name" content="Dokku">
    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.4.13/docs/assets/style.css" rel="stylesheet">
    <style>
    </style>
  </head>
--- a/8
+++ b/8
@@ -83,8 +83,12 @@ fi
 case "$1" in
  receive)
    APP="$2"; IMAGE=$(get_app_image_name $APP); IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
-    dokku_log_info1 "Cleaning up..."
-    docker_cleanup
+    if [[ -z "$DOKKU_SKIP_CLEANUP" ]]; then
+      dokku_log_info1 "Cleaning up..."
+      docker_cleanup
+    else
+      dokku_log_info1 "DOKKU_SKIP_CLEANUP set. Skipping dokku cleanup"
+    fi
    dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE..."
    dokku build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR"
    release_and_deploy "$APP"
--- a/plugins/20_events/commands
+++ b/plugins/20_events/commands
@@ -26,7 +26,7 @@ case "$1" in
    ;;

  events:list)
-    PLUGIN_DIR="$(dirname $0)"
+    PLUGIN_DIR="$(dirname $0)/"
    if [[ "$DOKKU_EVENTS" ]]; then
      logged="$(find $PLUGIN_DIR -type l -printf '%f ' | sort)"
      dokku_col_log_info2_quiet "Events currently logged"
@@ -39,7 +39,7 @@ case "$1" in
    ;;

  help | events:help)
-    cat && cat<<EOF
+    cat<<EOF
    events [-t], Show the last events (-t follows)
    events:list, List logged events
    events:on, Enable events logger
--- a/plugins/20_events/install
+++ b/plugins/20_events/install
@@ -56,6 +56,11 @@ $DOKKU_LOGS_DIR/*.log {
        create 664 syslog dokku
 }
 EOF
+
+  if [[ "$DOKKU_DISTRO" = "debian" ]]; then
+    sed -i '/\s*su syslog dokku/d; s/\(create [0-7][0-7][0-7]\) syslog dokku/\1 root dokku/g' $DOKKU_LOGROTATE_FILE
+  fi
+
  flag_rsyslog_needs_restart=y
 fi

--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -84,14 +84,19 @@ if [[ ! -s "${TMPDIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]];
    dokku_log_verbose "Skipping default check..."
    exit 0
  fi
-  dokku_log_verbose "For more efficient zero downtime deployments, create a file CHECKS."
-  dokku_log_verbose "See http://dokku.viewdocs.io/dokku/checks-examples.md for examples"
-  dokku_log_verbose "CHECKS file not found in container: Running simple container check..."
+
+  # We allow custom check for web instances only
+  if [[ "$DOKKU_APP_CONTAINER_TYPE" == "web" ]]; then
+    dokku_log_verbose "For more efficient zero downtime deployments, create a file CHECKS."
+    dokku_log_verbose "See http://dokku.viewdocs.io/dokku/checks-examples.md for examples"
+    dokku_log_verbose "CHECKS file not found in container: Running simple container check..."
+  else
+    dokku_log_verbose "Non web container detected: Running default container check..."
+  fi

  rm -rf $TMPDIR

  # simple default check to see if the container stuck around
-  # for more thorough checks, create a CHECKS file
  DOKKU_DEFAULT_CHECKS_WAIT="${DOKKU_DEFAULT_CHECKS_WAIT:-10}"
  dokku_log_info1 "Waiting for $DOKKU_DEFAULT_CHECKS_WAIT seconds ..."
  sleep $DOKKU_DEFAULT_CHECKS_WAIT
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -405,7 +405,7 @@ get_ipv4_regex() {
 }

 get_ipv6_regex() {
-  local RE_IPV6="$(_ipv4_regex)"
+  local RE_IPV6="$(_ipv6_regex)"
  # Ensure the ip address continues to the end of the line
  # Fixes using a wildcard dns service such as xip.io which allows for *.<ip address>.xip.io
  echo "${RE_IPV6}\$"
--- a/plugins/docker-options/commands
+++ b/plugins/docker-options/commands
@@ -1,118 +1,16 @@
 #!/usr/bin/env bash
-[[ " docker-options docker-options:add docker-options:remove help docker-options:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
+[[ " docker-options docker-options:add docker-options:remove help docker-options:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/docker-options/functions"

-get_app() {
-  [[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$1"
-  APP="$1"
-}
-
-get_phases() {
-  local passed_phases_list=$1
-  local phase
-  if [[ -n $passed_phases_list ]]; then
-    IFS=',' read -ra passed_phases <<< "$passed_phases_list"
-    for phase in "${passed_phases[@]}"; do
-      verify_phase $phase
-    done
-  fi
-}
-
-verify_phase() {
-  local phase
-  local phases=(build deploy run)
-  for phase in "${phases[@]}"; do
-    if [[ "$phase" = "$1" ]]; then
-      return 0
-    fi
-  done
-  dokku_log_fail "Phase(s) must be one of [${phases[*]}]"
-}
-
-get_phase_file_path() {
-  local phase=$1
-  local prefix="DOCKER_OPTIONS_"
-  phase_file_path="${DOKKU_ROOT}/${APP}/${prefix}${phase^^}"
-}
-
-create_phase_file_if_required() {
-  local phase_file_path=$1
-  [[ -f $phase_file_path ]] || {
-    touch $phase_file_path
-  }
-}
-
-display_phase_options() {
-  local phase=$1
-  local phase_file_path=$2
-  echo "${phase^} options:"
-  sed -e 's/^/    /' $phase_file_path
-}
-
-display_all_phases_options() {
-  local phases=(build deploy run)
-  for phase in "${phases[@]}"; do
-    get_phase_file_path $phase
-    if [[ -s $phase_file_path ]]; then
-       display_phase_options $phase $phase_file_path
-    fi
-  done
-}
-
-display_passed_phases_options() {
-  local passed_phases=("${!1}")
-  local phase
-  for phase in "${passed_phases[@]}"; do
-    get_phase_file_path $phase
-    if [[ ! -s $phase_file_path ]]; then
-      echo "${phase^} options: none"
-    else
-      display_phase_options $phase $phase_file_path
-    fi
-  done
-}
-
-get_passed_docker_option() {
-  [[ -z "$@" ]] && dokku_log_fail "Please specify docker options to add to the phase"
-  passed_docker_option=("$@")
-}
-
-add_passed_docker_option() {
-  local passed_phases=("${!1}")
-  shift
-  local passed_option_string="$*"
-  local phase
-  for phase in "${passed_phases[@]}"; do
-    get_phase_file_path $phase
-    create_phase_file_if_required $phase_file_path
-    echo "${passed_option_string}" >> $phase_file_path
-    all_phase_options=$(< $phase_file_path)
-    echo -e "${all_phase_options}" | sed '/^$/d' | sort -u > $phase_file_path
-  done
-}
-
-remove_passed_docker_option() {
-  local passed_phases=("${!1}")
-  shift
-  local passed_option_string="$*"
-  local phase
-  for phase in "${passed_phases[@]}"; do
-    get_phase_file_path $phase
-    [[ ! -s $phase_file_path ]] || {
-      all_phase_options=$(< $phase_file_path)
-      all_phase_options=$(echo -e "${all_phase_options}" | sed "s#^${passed_option_string}\$##")
-      echo -e "${all_phase_options}" | sed '/^$/d' | sort -u > $phase_file_path
-    }
-  done
-}
+declare APP # global assigned in case

 case "$1" in
  # Display applications docker options
  docker-options)
-    get_app $2
-    get_phases $3
+    verify_app_name "$2" && APP="$2"
+    read -ra passed_phases <<< "$(get_phases "$3")"
    if [[ ! "${passed_phases[@]}" ]]; then
      display_all_phases_options
    else
@@ -122,19 +20,20 @@ case "$1" in

  # Add a docker option to application
  docker-options:add)
-    get_app $2
-    get_phases $3
+    verify_app_name "$2" && APP="$2"
+    read -ra passed_phases <<< "$(get_phases "$3")"
    shift 3 # everything else passed is the docker option
-    get_passed_docker_option "$@"
+    passed_docker_option="$*"
+    [[ -z "$passed_docker_option" ]] && dokku_log_fail "Please specify docker options to add to the phase"
    add_passed_docker_option passed_phases[@] "${passed_docker_option[@]}"
  ;;

  # Remove a docker option from application
  docker-options:remove)
-    get_app $2
-    get_phases $3
+    verify_app_name "$2" && APP="$2"
+    read -ra passed_phases <<< "$(get_phases "$3")"
    shift 3 # everything else passed is the docker option
-    get_passed_docker_option "$@"
+    [[ -z ${passed_docker_option="$@"} ]] && dokku_log_fail "Please specify docker options to add to the phase"
    remove_passed_docker_option passed_phases[@] "${passed_docker_option[@]}"
  ;;

@@ -149,7 +48,7 @@ EOF
  ;;

  *)
-    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
  ;;

 esac
--- a/plugins/docker-options/functions
+++ b/plugins/docker-options/functions
@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+AVAILABLE_PHASES=(build deploy run)
+
+get_phase_file_path() {
+  local phase_file_prefix="DOCKER_OPTIONS_"
+  local phase=$1
+  [[ "$DOKKU_ROOT" && "$APP" && "$phase_file_prefix" && "$phase" ]] || dokku_log_fail "Error: phase_file_path is incomplete."
+  echo "${DOKKU_ROOT}/${APP}/${phase_file_prefix}${phase^^}"
+}
+
+get_phases() {
+  local passed_phases_list="$1"
+  local -r phases_allowed=$(sed -e 's/ /\|/g' <<< "${AVAILABLE_PHASES[@]}")
+  local phase
+  local passed_phases
+  if [[ -n "$passed_phases_list" ]]; then
+    OIFS=$IFS; IFS=','
+    read -ra passed_phases <<< "$passed_phases_list"
+    IFS=$OIFS
+    for phase in "${passed_phases[@]}"; do
+      [[ "$phase" = @($phases_allowed) ]] || dokku_log_fail "Phase(s) must be one of [${AVAILABLE_PHASES[*]}]"
+    done
+    echo "${passed_phases[@]}"
+  fi
+}
+
+create_phase_file_if_required() {
+  local phase_file_path="$1"
+  [[ -f "$phase_file_path" ]] || {
+    touch "$phase_file_path"
+  }
+}
+
+display_phase_options() {
+  local phase="$1"
+  local phase_file_path="$2"
+  echo "${phase^} options:"
+  sed -e 's/^/    /' "$phase_file_path"
+}
+
+display_all_phases_options() {
+  local phases=("${AVAILABLE_PHASES[@]}")
+  for phase in "${phases[@]}"; do
+    local phase_file_path
+    phase_file_path="$(get_phase_file_path "$phase")"
+    if [[ -s "$phase_file_path" ]]; then
+       display_phase_options "$phase" "$phase_file_path"
+    fi
+  done
+}
+
+display_passed_phases_options() {
+  local passed_phases=("${!1}")
+  local phase
+  for phase in "${passed_phases[@]}"; do
+    local phase_file_path
+    phase_file_path="$(get_phase_file_path "$phase")"
+    if [[ ! -s "$phase_file_path" ]]; then
+      echo "${phase^} options: none"
+    else
+      display_phase_options "$phase" "$phase_file_path"
+    fi
+  done
+}
+
+add_passed_docker_option() {
+  local passed_phases=("${!1}")
+  shift
+  local passed_option_string="$*"
+  local phase
+  for phase in "${passed_phases[@]}"; do
+    local phase_file_path
+    phase_file_path="$(get_phase_file_path "$phase")"
+    create_phase_file_if_required "$phase_file_path"
+    echo "${passed_option_string}" >> "$phase_file_path"
+    all_phase_options="$(< "$phase_file_path")"
+    echo -e "${all_phase_options}" | sed '/^$/d' | sort -u > "$phase_file_path"
+  done
+}
+
+remove_passed_docker_option() {
+  local passed_phases=("${!1}")
+  shift
+  local passed_option_string="$*"
+  local phase
+  for phase in "${passed_phases[@]}"; do
+    local phase_file_path
+    phase_file_path="$(get_phase_file_path "$phase")"
+    [[ ! -s "$phase_file_path" ]] || {
+      all_phase_options="$(< "$phase_file_path")"
+      all_phase_options=$(echo -e "${all_phase_options}" | sed "s#^${passed_option_string}\$##")
+      echo -e "${all_phase_options}" | sed '/^$/d' | sort -u > "$phase_file_path"
+    }
+  done
+}
--- a/plugins/named-containers/post-deploy
+++ b/plugins/named-containers/post-deploy
@@ -1,16 +1,29 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"

 APP="$1"; APP_ROOT="$DOKKU_ROOT/$APP"
 [[ -z $(stat -t "$APP_ROOT"/CONTAINER.* 2>/dev/null) ]] && exit 0
 for container in "$APP_ROOT"/CONTAINER.*; do
  DYNO=$(echo "$container" | sed -r 's/.*CONTAINER\.(.*)/\1/') || true
  NAME="$APP.$DYNO"
-  PREVIOUS=$(docker ps -a -q -f name="^.?$NAME\$") || true
-  if [[ -n $PREVIOUS ]]; then
-    docker rename "$NAME" "$NAME.$(date +%s)" > /dev/null
+  CURRENT_CONTAINER_ID="$(< $container)"
+  PREVIOUS_CIDS=$(docker ps -a -q -f name="^.?$NAME\$" | xargs) || true
+  if [[ -n $PREVIOUS_CIDS ]]; then
+    dokku_log_info1_quiet "Found previous container(s) ($PREVIOUS_CIDS) named $NAME"
+    # in case $PREVIOUS_CIDS has more than one entry
+    for cid in $PREVIOUS_CIDS; do
+      PREVIOUS_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$cid" || echo "dead")
+      # dead containers cannot be renamed
+      if [[ "$PREVIOUS_CONTAINER_STATUS" != "dead" ]]; then
+        CONTAINER_DATE_NAME="$NAME.$(date +%s)"
+        dokku_log_info2_quiet "renaming container ($cid) ${NAME} to $CONTAINER_DATE_NAME"
+        docker rename "$NAME" "$CONTAINER_DATE_NAME" > /dev/null
+      fi
+    done
  fi
  ID=$(cat "$container")
  CURRENT_NAME=$(docker inspect -f '{{.Name}}' "$ID" | tr -d /)
+  dokku_log_info2_quiet "renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
  docker rename "$CURRENT_NAME" "$NAME" > /dev/null
 done
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -235,8 +235,13 @@ EOF
      echo "}" >> $NGINX_CONF
    fi

-    dokku_log_info1 "Creating $SCHEME nginx.conf"
-    mv $NGINX_CONF "$DOKKU_ROOT/$APP/nginx.conf"
+    if is_deployed "$APP"; then
+      dokku_log_info1 "Creating $SCHEME nginx.conf"
+      mv $NGINX_CONF "$DOKKU_ROOT/$APP/nginx.conf"
+    else
+      dokku_log_info1 "App $APP has not been deployed. Skipping nginx config creation"
+      rm -f $NGINX_CONF
+    fi

    if is_deployed "$APP"; then
      dokku_log_info1 "Running nginx-pre-reload"
--- a/plugins/ps/commands
+++ b/plugins/ps/commands
@@ -55,11 +55,9 @@ case "$1" in
    ;;

  ps:rebuildall)
-    shopt -s nullglob
    for app in $(dokku_apps); do
      is_deployed $app && dokku ps:rebuild $app
    done
-    shopt -u nullglob
    ;;

  ps:restart)
@@ -73,15 +71,12 @@ case "$1" in
    ;;

  ps:restartall)
-    shopt -s nullglob
    for app in $(dokku_apps); do
      dokku ps:restart $app
    done
-    shopt -u nullglob
    ;;

  ps:restore)
-    shopt -s nullglob
    for app in $(dokku_apps); do
      DOKKU_APP_RESTORE=$(dokku config:get $app DOKKU_APP_RESTORE || true)
      if [[ $DOKKU_APP_RESTORE != 0 ]]; then
@@ -89,7 +84,6 @@ case "$1" in
        dokku ps:start $app
      fi
    done
-    shopt -u nullglob
  ;;

  ps:scale)
--- a/tests/apps/checks-root/package.json
+++ b/tests/apps/checks-root/package.json
@@ -5,8 +5,7 @@
    "express": "4.x"
  },
  "engines": {
-    "node": "0.12.x",
-    "npm": "2.x"
+    "node": "4.2.x"
  },
  "scripts": {
    "start": "node index.js"
--- a/tests/apps/config/package.json
+++ b/tests/apps/config/package.json
@@ -5,7 +5,6 @@
    "express": "2.5.x"
  },
  "engines": {
-    "node": "0.10.x",
-    "npm": "2.7.x"
+    "node": "4.2.x"
  }
 }
--- a/tests/apps/dockerfile-noexpose/package.json
+++ b/tests/apps/dockerfile-noexpose/package.json
@@ -10,7 +10,7 @@
    "express": "^4.0.0"
  },
  "engines": {
-    "node": "0.10.x"
+    "node": "4.2.x"
  },
  "repository": {
    "type": "git",
--- a/tests/apps/dockerfile/package.json
+++ b/tests/apps/dockerfile/package.json
@@ -10,7 +10,7 @@
    "express": "^4.0.0"
  },
  "engines": {
-    "node": "0.10.x"
+    "node": "4.2.x"
  },
  "repository": {
    "type": "git",
--- a/tests/apps/gitsubmodules/package.json
+++ b/tests/apps/gitsubmodules/package.json
@@ -5,7 +5,6 @@
    "express": "~3.3.4"
  },
  "engines": {
-    "node": "0.10.x",
-    "npm": "2.7.x"
+    "node": "4.2.x"
  }
 }
--- a/tests/apps/multi/package.json
+++ b/tests/apps/multi/package.json
@@ -10,7 +10,7 @@
  },
  "description": "Test application for heroku multi buildpack.",
  "engines": {
-    "node": "~0.10.30"
+    "node": "4.2.x"
  },
  "license": "ISC",
  "name": "test-buildpack-multi",
--- a/tests/apps/nodejs-express-noprocfile/package.json
+++ b/tests/apps/nodejs-express-noprocfile/package.json
@@ -5,8 +5,7 @@
    "express": "2.5.x"
  },
  "engines": {
-    "node": "0.10.x",
-    "npm": "2.7.x"
+    "node": "4.2.x"
  },
  "scripts": {
    "start": "node web.js"
--- a/tests/apps/nodejs-express/package.json
+++ b/tests/apps/nodejs-express/package.json
@@ -5,7 +5,6 @@
    "express": "2.5.x"
  },
  "engines": {
-    "node": "0.10.x",
-    "npm": "2.7.x"
+    "node": "4.2.x"
  }
 }
--- a/tests/apps/nodejs-worker/package.json
+++ b/tests/apps/nodejs-worker/package.json
@@ -2,7 +2,6 @@
  "name": "node-example",
  "version": "0.0.1",
  "engines": {
-    "node": "0.10.x",
-    "npm": "2.7.x"
+    "node": "4.2.x"
  }
 }
--- a/tests/ci/parallel_runner.sh
+++ b/tests/ci/parallel_runner.sh
@@ -19,7 +19,14 @@ setup_circle() {
  sudo -E CI=true make -e install
  sudo -E make -e setup-deploy-tests
  make -e ci-dependencies
+  # circleci runs Ubuntu 12.04 and thus a previous version of bash (4.2) than 14.04
+  # sudo apt-get install -y -q "bash=$(apt-cache show bash | egrep "^Version: 4.3" | head -1 | awk -F: '{ print $2 }' | xargs)"
+  bash --version
  docker version
+  # setup .dokkurc
+  sudo -E mkdir -p /home/dokku/.dokkurc
+  sudo -E chown dokku:ubuntu /home/dokku/.dokkurc
+  sudo -E chmod 775 /home/dokku/.dokkurc
 }

 if [[ -n "$CIRCLE_NODE_INDEX" ]] && [[ "$MODE" == "setup" ]]; then
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	8a0b299af7	Release 0.4.13	2016-01-20 22:59:29 -05:00
Michael Hobbs	543642eb5f	Merge pull request #1872 from kenips/support/better_logs_for_checks Update log to better reflect what's going on with CHECKS	2016-01-18 17:48:22 -08:00
Ken Ip	bf1e9ddaee	Update log to better reflect what's going on with CHECKS	2016-01-18 19:35:47 -05:00
Michael Hobbs	71351f1a02	Merge pull request #1871 from dokku/mh-support-bash-4.2 support bash 4.2 so we don't have to modify all plugin test envs	2016-01-17 22:01:33 -08:00
Michael Hobbs	33c6e56030	support bash 4.2 so we don't have to modify all plugin test envs	2016-01-17 18:29:49 -08:00
Jose Diaz-Gonzalez	a0e1416027	Release 0.4.12	2016-01-16 17:21:44 -05:00
Justin Clark	c79a43f38a	Merge pull request #1870 from u2mejc/u2mejc-issue1869 Remove arg check from docker-options/functions, global var cleanup	2016-01-15 17:15:42 -08:00
Justin Clark	3630cc2a99	Remove arg check from docker-options/functions, remove another global var	2016-01-15 14:45:29 -08:00
Jose Diaz-Gonzalez	309cdc6ab6	Merge pull request #1868 from alessio/fix-events-help-screen Prevent dokku to hang on events:help	2016-01-15 15:35:26 -05:00
Alessio Treglia	2b7e327e09	Prevent dokku to hang on events:help Update events:help case against to Dokku 0.4's new help screen handling.	2016-01-15 20:28:16 +00:00
Jose Diaz-Gonzalez	db300f06da	Release 0.4.11	2016-01-14 19:59:11 -05:00
Jose Diaz-Gonzalez	a2b775af42	Merge pull request #1855 from jvanbaarsen/add-skip-keyfile Add skip_keyfile option for deb package	2016-01-14 17:53:56 -05:00
Michael Hobbs	999cbc0739	Merge pull request #1864 from znz/no-longer-need-to-set-nullglob no longer need to set nullglob	2016-01-14 08:12:37 -08:00
Jose Diaz-Gonzalez	eb9d659361	Merge pull request #1863 from znz/fix-a-typo Fix a typo	2016-01-14 10:14:07 -05:00
Kazuhiro NISHIYAMA	99ce2fa51d	no longer need to set nullglob	2016-01-14 23:34:03 +09:00
Kazuhiro NISHIYAMA	d3a6e39b4e	Fix a typo	2016-01-14 23:30:10 +09:00
Michael Hobbs	bc00acb5ff	Merge pull request #1848 from u2mejc/u2mejc_docker-options_functions Move docker-options functions to functions file, rework phase_file_path	2016-01-13 11:28:00 -08:00
Justin Clark	9a966f6f08	Move docker-options functions to functions file, rework code	2016-01-13 10:48:52 -08:00
Michael Hobbs	34a5766ce3	Merge pull request #1862 from dokku/mh-update-circleci-bash install bash 4.3.x on circleci	2016-01-12 20:12:04 -08:00
Michael Hobbs	be9ab06116	install bash 4.3.x on circleci	2016-01-12 18:58:43 -08:00
Jeroen van Baarsen	2a4155aefc	Add skip_keyfile option for deb package There are cases where we don't want the check for keyfile, this will add a config option, that allows you to skip this particular check. Fixes #1851 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2016-01-12 17:11:13 +01:00
Jose Diaz-Gonzalez	4dde70abdc	Merge pull request #1859 from dhinus/dhinus-patch-1 Fix command for debconf-set-selections	2016-01-12 08:06:05 -05:00
Francesco Negri	7eeb6a2b95	Fix command for debconf-set-selections	2016-01-12 13:00:06 +00:00
Jose Diaz-Gonzalez	6931c3df5a	Merge pull request #1856 from madflow/docker-options-404 Fixed dead documentation link	2016-01-11 11:28:34 -05:00
madflow	0ad650fb91	Fixed dead documentation link	2016-01-11 17:04:46 +01:00
Jose Diaz-Gonzalez	72135f8fbf	Merge pull request #1854 from fedosov/patch-1 Update year in footer (2013-2016)	2016-01-10 14:16:15 -05:00
Mikhail Fedosov	546522264e	Update year in footer (2013-2016)	2016-01-10 22:03:23 +03:00
Jose Diaz-Gonzalez	353f96cb93	Merge pull request #1849 from floriangosse/fix-debian-log-user Fix logrotate file for debian system	2016-01-09 08:01:48 -05:00
Florian Goße	7a72146e82	modify logrotate file if the distro is debian	2016-01-09 11:35:47 +01:00
Jose Diaz-Gonzalez	f3627d4f84	Merge pull request #1841 from dokku/1806_mh-nginx-build-config-no-deploy don't build nginx config if the app has not been deployed	2016-01-08 20:03:27 -05:00
Michael Hobbs	d98ed122a6	Merge pull request #1844 from dokku/mh-named-containers named-containers: handle multiple old containers and don't attempt to rename a dead container	2016-01-07 20:19:31 -08:00
Michael Hobbs	30be9b7959	Merge pull request #1845 from dokku/mh-update-node-test-apps update nodejs in test apps	2016-01-07 20:19:14 -08:00
Michael Hobbs	8562afde38	disable debug on docker daemon to avoid additional IO	2016-01-07 19:43:56 -08:00
Michael Hobbs	09936b37fa	update nodejs in test apps	2016-01-07 18:00:12 -08:00
Michael Hobbs	8051fb86e7	named-containers: handle multiple old containers and don't attempt to rename a dead container	2016-01-07 17:56:27 -08:00
Jose Diaz-Gonzalez	c29ae712f3	Merge pull request #1843 from sseemayer/master Move let's encrypt plugin to official plugins	2016-01-07 15:26:37 -05:00
Stefan Seemayer	88b0fc5d22	Move let's encrypt plugin to official plugins	2016-01-07 21:22:11 +01:00
Michael Hobbs	889555bb43	fix typo with DOKKU_SKIP_CLEANUP	2016-01-07 10:34:40 -08:00
Michael Hobbs	50194e5923	don't build nginx config if the app has not been deployed. closes #1806	2016-01-07 10:25:47 -08:00
Michael Hobbs	bfecd3beb4	Merge pull request #1842 from dokku/mh-skip-cleanup-in-ci skip cleanup in ci to speed up tests	2016-01-07 10:25:27 -08:00
Michael Hobbs	74fd7e22d0	skip cleanup in ci to speed up tests	2016-01-07 09:53:04 -08:00
Jose Diaz-Gonzalez	2b97d9d677	Merge pull request #1840 from alessio/fix-dokku-0.4-events Append trailing slash '/' to $PLUGIN_DIR	2016-01-07 06:49:52 -05:00
Alessio Treglia	546010246c	Append trailing slash '/' to $PLUGIN_DIR This is to prevent find's misbehaviours which lead events:list to output incorrent information. Fixes #1839	2016-01-07 11:46:53 +00:00
Jose Diaz-Gonzalez	f002a662bd	Merge pull request #1838 from Epigene/patch-1 Fixed typo	2016-01-07 06:25:15 -05:00
Augusts Bautra	fde47dfa80	Fixed typo	2016-01-07 13:21:43 +02:00