Release 0.4.11

Merge pull request #1855 from jvanbaarsen/add-skip-keyfile
Add skip_keyfile option for deb package
2016-01-14 19:59:11 -05:00 · 2016-01-14 17:53:56 -05:00 · 2016-01-14 08:12:37 -08:00 · 2016-01-14 10:14:07 -05:00 · 2016-01-14 23:34:03 +09:00 · 2016-01-14 23:30:10 +09:00
53 changed files with 433 additions and 264 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,7 +58,7 @@ etc). Please include:
 * The output of `free -m`
 * The output of `docker version`.
 * The output of `docker -D info`.
-* The output of `docker run -ti gliderlabs/herokuish:latest herokuish version`
+* The output of `docker run --rm -ti gliderlabs/herokuish:latest herokuish version`
 * The output of `dokku version`.
 * The output of `dokku plugin`.

--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,63 @@
 # History

+## 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:
+
+- `dokku plugin:update` can now be used to update a specific plugin. Previously, this could potentially result in an error a user would have to manually resolve.
+- We have started labeling all dokku-managed containers. In a future minor release, triggering a `dokku cleanup` will remove *only* exited containers that are managed by dokku. This change allows users to start containers outside of dokku and be assured that dokku would not inadvertently remove them.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1818: @josegonzalez Fix pre-receive git-hook in apps:rename
+- #1819: @andrewsomething Write out /home/dokku/HOSTNAME as specified by the web installer.
+- #1823: @josegonzalez Fix output formatting of dokku apps
+- #1827: @michaelshobbs Use docker 1.9.0 on circleci
+- #1834: @jvanbaarsen Make sure we ignore hidden files in the SSL cert check
+- #1835: @josegonzalez Add support to herokuish for more versions of docker-engine
+- #1837: @michaelshobbs Add back some deploy tests that test dokku functionality
+
+### New Features
+
+- #1826: @michaelshobbs Implement plugn update
+- #1828: @michaelshobbs Label all dokku-managed containers
+- #1829: @michaelshobbs Implement dokku report command
+
+### Documentation
+
+- #1822: --no-restart option after config:set not before
+
 ## 0.4.9

 This release is significant for two reasons:
--- 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.9/bootstrap.sh
-    sudo DOKKU_TAG=v0.4.9 bash bootstrap.sh
+    wget https://raw.githubusercontent.com/dokku/dokku/v0.4.11/bootstrap.sh
+    sudo DOKKU_TAG=v0.4.11 bash bootstrap.sh

 ### Upgrading

--- a/circle.yml
+++ b/circle.yml
@@ -1,7 +1,7 @@
 machine:
  pre:
-    - echo 'DOCKER_OPTS="-s btrfs -e lxc -D --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.8.2-circleci-cp-workaround'
+    - 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:
    - docker
@@ -10,8 +10,9 @@ 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:
  override:
-    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 1800 }
+    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 3600 }
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -9,7 +9,7 @@ import subprocess
 import sys
 import threading

-VERSION = 'v0.4.9'
+VERSION = 'v0.4.11'

 hostname = ''
 try:
@@ -95,6 +95,9 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
                os.remove('{0}/VHOST'.format(dokku_root))
            except OSError:
                pass
+        with open('{0}/HOSTNAME'.format(dokku_root), 'w') as f:
+            f.write(params['hostname'].value)
+

        command = ['sshcommand', 'acl-add', 'dokku', 'admin']
        for key in params['keys'].value.split("\n"):
--- a/deb.mk
+++ b/deb.mk
@@ -1,6 +1,6 @@
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.7
+HEROKUISH_VERSION ?= 0.3.8
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb

@@ -75,7 +75,7 @@ deb-herokuish: deb-setup
 	cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish

 	echo "-> Creating $(HEROKUISH_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine | docker-engine-cs' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' .
+	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs | docker-engine | lxc-docker (>= 1.6.1) | docker.io (>= 1.6.1) | tutum-agent' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' .
 	mv *.deb /tmp

 deb-dokku: deb-setup
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.4.9
+Version: 0.4.11
 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.9/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.11/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.9\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.11\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.9\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.11\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.9\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.11\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.9\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.11\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.9\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.11\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.9\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.11\/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.9/docs/assets/dokku.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.11/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.9/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/configuration-management.md
+++ b/docs/configuration-management.md
@@ -30,7 +30,7 @@ dokku config:set node-js-app KEY=\"VAL\ WITH\ SPACES\"
 When setting or unsetting environment variables, you may wish to avoid an application restart. This is useful when developing plugins or when setting multiple environment variables in a scripted manner. To do so, use the `--no-restart` flag:

 ```shell
-dokku --no-restart config:set node-js-app ENV=prod
+dokku config:set --no-restart node-js-app ENV=prod
 ```

 If you wish to have the variables output in an `eval`-compatible form, you can use the `--export` flag:
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -90,3 +90,4 @@ A few notes:
  ```
 - From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
 - As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](http://dokku.viewdocs.io/dokku/development/plugin-triggers) doc for examples.
+- As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup`. If manually calling `docker run`, include `$DOKKU_GLOBAL_RUN_ARGS`. This will ensure you intermediate containers labeled correctly.
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -263,7 +263,7 @@ CMD="cat > gm && \
  dpkg -s graphicsmagick > /dev/null 2>&1 || \
  (apt-get update && apt-get install -y graphicsmagick && apt-get clean)"

-ID=$(docker run -i -a stdin $IMAGE /bin/bash -c "$CMD")
+ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
 test $(docker wait $ID) -eq 0
 docker commit $ID $IMAGE > /dev/null
 ```
@@ -290,7 +290,7 @@ CMD="cat > gm && \
  dpkg -s CONTAINER_PACKAGE > /dev/null 2>&1 || \
  (apt-get update && apt-get install -y CONTAINER_PACKAGE && apt-get clean)"

-ID=$(docker run -i -a stdin $IMAGE /bin/bash -c "$CMD")
+ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
 test $(docker wait $ID) -eq 0
 docker commit $ID $IMAGE > /dev/null
 ```
@@ -374,7 +374,7 @@ APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 verify_app_name "$APP"

 dokku_log_info1 "Running gulp"
-id=$(docker run -d $IMAGE /bin/bash -c "cd /app && gulp default")
+id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $IMAGE /bin/bash -c "cd /app && gulp default")
 test $(docker wait $id) -eq 0
 docker commit $id $IMAGE > /dev/null
 dokku_log_info1 "Building UI Complete"
@@ -435,7 +435,7 @@ APP="$1"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"; IMAGE=$(get_app_image_name $AP
 verify_app_name "$APP"

 if [[ -d $GULP_CACHE_DIR ]]; then
-  docker run --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+  docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
 fi
 ```

--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -22,15 +22,15 @@ Example apps can be found here:
  $ sudo su -
  $ cd ~/dokku
  $ make ci-dependencies setup-deploy-tests
-  $ make test  # run the entire test suite (linter, bats tests, and app deployment tests)
+  $ make test  # execute the entire test suite (linter, bats tests, and app deployment tests)
  $
-  $ make lint  # linter
-  $ make unit-tests  # bats tests
-  $ make deploy-tests  # app deployment tests
+  $ make lint copyfiles # run linter & update vagrant dokku install from local git clone
+  $ make unit-tests  # execute all bats tests
+  $ make deploy-tests  # execute all app deployment tests
  ```
 - Additionally you may run a specific app deployment tests with a target similar to:

  ```shell
-  make deploy-test-nodejs-express
+  $ make deploy-test-nodejs-express
  ```
 - For a full list of test make targets check out `tests.mk` in the root of the dokku repository.
--- 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.9/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/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.9/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.11/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.9/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.11/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path">~</span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.4.9 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.4.11 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.9/bootstrap.sh</span>
+        <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.11/bootstrap.sh</span>
      </p>
      <p class="line">
        <span class="path">~</span>
        <span class="prompt">$</span>
-        <span class="command">sudo DOKKU_TAG=v0.4.9 bash bootstrap.sh</span>
+        <span class="command">sudo DOKKU_TAG=v0.4.11 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.9/bootstrap.sh
-sudo DOKKU_TAG=v0.4.9 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.4.11/bootstrap.sh
+sudo DOKKU_TAG=v0.4.11 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -16,7 +16,7 @@ Let's take a quick look at the current dokku nginx plugin that's shipped with do
 # This command requires `root` permissions as the `install` and `install-dependencies`
 # plugin triggers may utilize commands such as `apt-get`. For non-core plugins, please
 # inspect those plugins before running the following command as `root` user.
-sudo dokku plugin:install <git_url>
+sudo dokku plugin:install <git_url> [--committish tag/branch/commit|--name custom-plugin-name]

 # previous versions (0.3.x and below) of dokku require a manual process to install plugins
 cd /var/lib/dokku/plugins
@@ -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.9/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/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.9/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.9/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.11/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.9/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.4.11/docs/assets/style.css" rel="stylesheet">
    <style>
    </style>
  </head>
--- a/17
+++ b/17
@@ -29,6 +29,9 @@ export DOKKU_VALID_EXIT=0
 export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
 export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}

+export DOKKU_CONTAINER_LABEL=dokku
+export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL"
+
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"

 [[ -f $DOKKU_ROOT/dokkurc ]] && source $DOKKU_ROOT/dokkurc
@@ -80,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"
@@ -136,11 +143,11 @@ case "$1" in
        if [[ "$PROC_TYPE" == "web" ]]; then
          port=${DOKKU_DOCKERFILE_PORT:=5000}
          if [[ "$BIND_EXTERNAL" = "true" ]]; then
-            id=$(docker run -d -p $port -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
+            id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -p $port -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
            port=$(docker port $id $port | sed 's/[0-9.]*://')
            ipaddr=127.0.0.1
          else
-            id=$(docker run -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
+            id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
            ipaddr=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $id)
            # Docker < 1.9 compatibility
            if [[ -z $ipaddr ]]; then
@@ -148,7 +155,7 @@ case "$1" in
            fi
          fi
        else
-          id=$(docker run -d $DOCKER_ARGS $IMAGE $START_CMD)
+          id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOCKER_ARGS $IMAGE $START_CMD)
        fi

        # if we can't post-deploy successfully, kill new container
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-[[ " build release trace delete ls run url urls version help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
+[[ " build release trace delete ls run url urls report version help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
@@ -17,7 +17,7 @@ case "$1" in

    case "$IMAGE_SOURCE_TYPE" in
      herokuish)
-        id=$(tar -c . | docker run -i -a stdin $DOKKU_IMAGE /bin/bash -c "mkdir -p /app && tar -xC /app")
+        id=$(tar -c . | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $DOKKU_IMAGE /bin/bash -c "mkdir -p /app && tar -xC /app")
        test "$(docker wait $id)" -eq 0
        docker commit $id $IMAGE > /dev/null
        [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR
@@ -25,7 +25,7 @@ case "$1" in

        DOCKER_ARGS=$(: | plugn trigger docker-args-build $APP $IMAGE_SOURCE_TYPE)
        [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
-        id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
+        id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
        docker attach $id
        test "$(docker wait $id)" -eq 0
        docker commit $id $IMAGE > /dev/null
@@ -60,12 +60,12 @@ case "$1" in
      herokuish)
        plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
        if [[ -n $(config_export global) ]]; then
-          id=$(config_export global | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
+          id=$(config_export global | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
          test "$(docker wait $id)" -eq 0
          docker commit $id $IMAGE > /dev/null
        fi
        if [[ -n $(config_export app $APP) ]]; then
-          id=$(config_export app $APP | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
+          id=$(config_export app $APP | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
          test "$(docker wait $id)" -eq 0
          docker commit $id $IMAGE > /dev/null
        fi
@@ -144,7 +144,7 @@ case "$1" in
    has_tty && DOKKU_RUN_OPTS+=" -i -t"
    is_image_herokuish_based "$IMAGE" && EXEC_CMD="/exec"

-    docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
+    docker run $DOKKU_GLOBAL_RUN_ARGS $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
    ;;

  url | urls)
@@ -191,6 +191,21 @@ case "$1" in
    fi
  ;;

+  report)
+    dokku_log_info1 "uname: $(uname -a)"
+    dokku_log_info1 "memory: "
+    free -m
+    dokku_log_info1 "docker version: "
+    docker version
+    dokku_log_info1 "docker daemon info: "
+    docker -D info
+    dokku_log_info1 "herokuish version: "
+    docker run --rm -ti gliderlabs/herokuish:latest herokuish version
+    dokku_log_info1 "dokku version: $(dokku version)"
+    dokku_log_info1 "dokku plugins: "
+    dokku plugin
+    ;;
+
  version)
    cat "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
    ;;
--- 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"
--- 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/apps/commands
+++ b/plugins/apps/commands
@@ -7,7 +7,9 @@ source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 case "$1" in
  apps)
    dokku_log_info2_quiet "My Apps"
-    dokku_apps
+    for app in $(dokku_apps); do
+      echo "$app"
+    done
    ;;

  apps:create)
@@ -21,12 +23,13 @@ case "$1" in
    NEW_APP="$3"

    mkdir -p "$DOKKU_ROOT/$NEW_APP"
-    docker run --rm -v "$DOKKU_ROOT/$OLD_APP/cache:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
+    docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$DOKKU_ROOT/$OLD_APP/cache:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
    rm -rf "$DOKKU_ROOT/$OLD_APP/cache"
    cp -a "$DOKKU_ROOT/$OLD_APP/." "$DOKKU_ROOT/$NEW_APP"
    dokku apps:destroy $OLD_APP --force
    sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/URLS"
    sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/VHOST"
+    sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
    dokku ps:rebuild $NEW_APP
    plugn trigger post-app-rename $OLD_APP $NEW_APP
    echo "Renaming $OLD_APP to $NEW_APP... done"
--- a/plugins/apps/pre-delete
+++ b/plugins/apps/pre-delete
@@ -6,5 +6,5 @@ APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG); CACHE_DIR
 verify_app_name "$APP"

 if [[ -d $CACHE_DIR ]]; then
-  docker run --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+  docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
 fi
--- a/plugins/build-env/pre-build-buildpack
+++ b/plugins/build-env/pre-build-buildpack
@@ -24,12 +24,12 @@ if [[ ! -z "$BUILD_ENV" ]]; then
  dokku_log_info1 "Adding BUILD_ENV to build environment..."
  # create build env files for use in buildpacks like this:
  # https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
-  id=$(echo $BUILD_ENV |sed -e 's@export @@g' -e 's@\\n@ @g' | docker run -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in $(cat); do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \\\"\2\\\" >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
+  id=$(echo $BUILD_ENV |sed -e 's@export @@g' -e 's@\\n@ @g' | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in $(cat); do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \\\"\2\\\" >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
  test "$(docker wait $id)" -eq 0
  docker commit $id $IMAGE > /dev/null

  # create build env for 'old style' buildpacks and dokku plugins
-  id=$(echo -e "$BUILD_ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
+  id=$(echo -e "$BUILD_ENV" | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
  test "$(docker wait $id)" -eq 0
  docker commit $id $IMAGE > /dev/null
 fi
--- a/plugins/certs/commands
+++ b/plugins/certs/commands
@@ -39,7 +39,7 @@ certs_set() {
    cd $TEMP_DIR
    tar xvf - <&0

-    CRT_FILE_SEARCH=$(find . -type f -name "*.crt")
+    CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name "*.crt")
    CRT_FILE_COUNT=$(printf "%s" "$CRT_FILE_SEARCH" | grep -c '^')
    if [[ $CRT_FILE_COUNT -lt 1 ]]; then
      dokku_log_fail "Tar archive is missing .crt file"
@@ -49,7 +49,7 @@ certs_set() {
      CRT_FILE=$CRT_FILE_SEARCH
    fi

-    KEY_FILE_SEARCH=$(find . -type f -name "*.key")
+    KEY_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name "*.key")
    KEY_FILE_COUNT=$(printf "%s" "$KEY_FILE_SEARCH" | grep -c '^')
    if [[ $KEY_FILE_COUNT -lt 1 ]]; then
      dokku_log_fail "Tar archive is missing .key file"
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -174,7 +174,7 @@ get_running_image_tag() {
 is_image_herokuish_based() {
  # circleci can't support --rm as they run lxc in lxc
  [[ ! -f "/home/ubuntu/.circlerc" ]] && local DOCKER_ARGS="--rm"
-  docker run --entrypoint="/bin/sh" $DOCKER_ARGS "$@" -c "test -f /exec"
+  docker run $DOKKU_GLOBAL_RUN_ARGS --entrypoint="/bin/sh" $DOCKER_ARGS "$@" -c "test -f /exec"
 }

 is_number() {
@@ -211,7 +211,7 @@ copy_from_image() {
  verify_app_name $APP

  if verify_image "$IMAGE"; then
-    CID=$(docker run -d $IMAGE bash)
+    CID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $IMAGE bash)
    docker cp "$CID:$SRC_FILE" "$DST_DIR"
    docker rm -f "$CID" &> /dev/null
  else
@@ -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,14 @@
 #!/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"
-
-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
-}
+source "$PLUGIN_CORE_AVAILABLE_PATH/docker-options/functions"

 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 +18,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 +46,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,95 @@
+#!/usr/bin/env bash
+[[ " 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"
+
+AVAILABLE_PHASES=(build deploy run)
+
+get_phase_file_path() {
+  local phase_file_prefix="DOCKER_OPTIONS_"
+  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
+    IFS=',' read -ra passed_phases <<< "$passed_phases_list"
+    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)"
+    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)"
+    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)"
+    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)"
+    [[ ! -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/plugin/commands
+++ b/plugins/plugin/commands
@@ -16,8 +16,8 @@ case "$1" in
        PLUGIN_PATH="$PLUGIN_CORE_PATH" plugn trigger install
        ;;
      https:*|git:*|ssh:*)
-        PLUGIN_GIT_URL="$2"
-        download_and_enable_plugin "$PLUGIN_GIT_URL" "$3"
+        shift
+        download_and_enable_plugin "$@"
        plugn trigger install
        ;;
      *)
@@ -34,16 +34,12 @@ case "$1" in
    ;;

  plugin:update)
-    case "$2" in
-      https:*|git:*)
-        PLUGIN_GIT_URL="$2"
-        download_and_enable_plugin "$PLUGIN_GIT_URL" "$3"
-        plugn trigger update
-        ;;
-      *)
-        plugn trigger update
-        ;;
-    esac
+    if [[ -n "$2" ]]; then
+      PLUGIN="$2"
+      PLUGIN_COMMITTISH="$3"
+      plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
+    fi
+    plugn trigger update
    ;;

  plugin:disable)
@@ -67,9 +63,9 @@ case "$1" in
  help | plugin:help)
    cat<<EOF
    plugin, Print active plugins
-    plugin:install [--core|git-url], Optionally download git-url & run install trigger for active plugins (or only core ones)
+    plugin:install [--core|git-url [--committish tag|branch|commit|--name custom-plugin-name]], Optionally download git-url (with custom tag/committish) & run install trigger for active plugins (or only core ones)
    plugin:install-dependencies [--core], Run install-dependencies trigger for active plugins (or only core ones)
-    plugin:update [git-url], Optionally download git-url & run update trigger for active plugins
+    plugin:update [name [committish]], Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
    plugin:enable <name>, Enable a previously disabled plugin
    plugin:disable <name>, Disable an installed plugin (third-party only)
    plugin:uninstall <name>, Uninstall a plugin (third-party only)
--- a/plugins/plugin/functions
+++ b/plugins/plugin/functions
@@ -27,18 +27,44 @@ download_plugin() {

 download_and_enable_plugin() {
  local PLUGIN_GIT_URL="$1"
-  local CUSTOM_NAME="$2"
+  shift
+  while getopts ":-:" opt "$@"; do
+    case "$opt" in
+      -)
+        case "$OPTARG" in
+          committish)
+            val="${!OPTIND}"; OPTIND=$(( OPTIND + 1 ))
+            local PLUGIN_COMMITTISH="$val"
+            ;;
+          name)
+            val="${!OPTIND}"; OPTIND=$(( OPTIND + 1 ))
+            local CUSTOM_NAME="$val"
+            ;;
+        esac
+        ;;
+    esac
+  done
  local PLUGIN_NAME=${CUSTOM_NAME:-$(plugin_name "$PLUGIN_GIT_URL")}
  dokku_log_info1_quiet "Cloning plugin repo $PLUGIN_GIT_URL to $PLUGIN_AVAILABLE_PATH/$PLUGIN_NAME"
  download_plugin "$PLUGIN_GIT_URL" "$PLUGIN_NAME"
  enable_plugin "$PLUGIN_NAME"
+  if [[ -n "$PLUGIN_COMMITTISH" ]];then
+    update_plugin "$PLUGIN_NAME" "$PLUGIN_COMMITTISH"
+  fi
+}
+
+update_plugin() {
+  local PLUGIN="$1"
+  local PLUGIN_COMMITTISH="$2"
+  [[ ! -e $PLUGIN_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Plugin ($PLUGIN) is not currently installed"
+  plugn update "$@"
 }

 uninstall_plugin() {
-  local PLUGIN_NAME="$1"
+  local PLUGIN="$1"
  [[ -e $PLUGIN_CORE_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Cannot uninstall a core plugin"
-  [[ ! -e $PLUGIN_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Plugin does not exist"
-  plugn uninstall $PLUGIN_NAME
+  [[ ! -e $PLUGIN_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Plugin ($PLUGIN) is not currently installed"
+  plugn uninstall $PLUGIN
  dokku_log_info1_quiet "Plugin $PLUGIN uninstalled"
 }

--- 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/Gemfile
+++ b/tests/apps/multi/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"

-ruby '1.9.3'
+ruby '2.2.4'

 gem 'compass', ">= 1.0.1"
 gem 'sass-globbing'
--- 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,6 +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
@@ -51,6 +59,8 @@ case "$CIRCLE_NODE_INDEX" in
  2)
    echo "=====> make unit-tests (3/4) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
    sudo -E UNIT_TEST_BATCH=3 make -e unit-tests
+    echo "=====> make deploy tests"
+    sudo -E make -e deploy-test-checks-root deploy-test-config deploy-test-multi
    ;;

  3)
--- a/tests/unit/10_certs.bats
+++ b/tests/unit/10_certs.bats
@@ -38,6 +38,13 @@ teardown() {
  assert_success
 }

+@test "(certs) certs:add < tar should ignore OSX hidden files" {
+  run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/osx_ssl_tarred.tar"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
@test "(certs) certs:info" {
  run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:info $TEST_APP"
  echo "output: "$output
--- a/tests/unit/40_plugin.bats
+++ b/tests/unit/40_plugin.bats
@@ -12,8 +12,13 @@ teardown() {
  remove_test_plugin || true
 }

-@test "(plugin) plugin:install, plugin:disable, plugin:uninstall" {
-  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO"
+@test "(plugin) plugin:install, plugin:disable, plugin:update plugin:uninstall" {
+  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --name $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin:update $TEST_PLUGIN_NAME"
  echo "output: "$output
  echo "status: "$status
  assert_success
@@ -49,6 +54,33 @@ teardown() {
  assert_failure
 }

+@test "(plugin) plugin:install plugin:update (with tag)" {
+  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --committish v0.2.0 --name $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin:update $TEST_PLUGIN_NAME v0.3.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.3.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
@test "(plugin) plugin:install, plugin:disable, plugin:uninstall as non-root user failure" {
  run bash -c "sudo -E -u nobody dokku plugin:install $TEST_PLUGIN_GIT_REPO"
  echo "output: "$output
--- a/tests/unit/osx_ssl_tarred.tar
+++ b/tests/unit/osx_ssl_tarred.tar
Author	SHA1	Message	Date
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
Jose Diaz-Gonzalez	f7e8c9be90	Release 0.4.10	2016-01-07 01:14:09 -05:00
Michael Hobbs	606e27653f	Merge pull request #1837 from dokku/mh-add-some-deploy-tests add back some deploy tests that test dokku functionality	2016-01-06 21:27:50 -08:00
Michael Hobbs	28633003d5	fix docker version and add back some deploy tests that test dokku functionality	2016-01-06 20:53:08 -08:00
Jose Diaz-Gonzalez	dcf9e0ae58	Merge pull request #1835 from dokku/josegonzalez-patch-1 Add support for more versions of docker-engine	2016-01-06 16:51:04 -05:00
Jose Diaz-Gonzalez	5b526a52fc	Add support for more versions of docker-engine [ci skip]	2016-01-06 13:34:09 -05:00
Michael Hobbs	729a2246c6	[ci skip] cleanup some language in test docs. add reference to copyfile target. closes #1833	2016-01-06 08:11:50 -08:00
Michael Hobbs	c8c3381dd6	Merge pull request #1834 from jvanbaarsen/ignore-osx-hidden-files Make sure we ignore hidden files in the SSL cert check	2016-01-06 07:58:35 -08:00
Jeroen van Baarsen	9767b90826	Make sure we ignore hidden files in the SSL cert check OSX creates hidden files: `./._server.key` and `./._server.crt`. The Dokku cert plugin is choking on those files. We should probably just ignore them, and go on with our lives Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2016-01-06 14:36:07 +01:00
Michael Hobbs	68b02c40a7	Merge pull request #1827 from dokku/mh-use-docker-circleci-1.9.x use docker 1.9.0 on circleci	2016-01-05 13:05:11 -08:00
Michael Hobbs	16544a77e2	Merge pull request #1828 from dokku/mh-label-dokku-containers label all dokku containers	2016-01-05 12:39:24 -08:00
Michael Hobbs	1c6916c68f	Merge pull request #1829 from dokku/mh-dokku-report implement dokku report command	2016-01-05 12:25:45 -08:00
Michael Hobbs	d7b5d6e904	[ci skip] implement dokku report command	2016-01-05 12:24:07 -08:00
Michael Hobbs	fdefff329a	[ci skip] docs cleanu	2016-01-05 12:23:29 -08:00
Michael Hobbs	39bba0b36e	use docker 1.9.0 on circleci	2016-01-05 12:05:44 -08:00
Michael Hobbs	17e7869150	label all dokku containers	2016-01-05 11:55:07 -08:00
Jose Diaz-Gonzalez	fec6db13fb	Merge pull request #1826 from dokku/1531_mh-plugin-update implement plugn update	2016-01-05 14:17:53 -05:00
Michael Hobbs	fc512b3231	implement plugn update and allow plugin:install to accept committish. closes #1531	2016-01-05 10:47:27 -08:00
Jose Diaz-Gonzalez	1805f41918	Merge pull request #1823 from dokku/josegonzalez-patch-1 Fix output of dokku apps	2016-01-04 18:32:54 -05:00
Jose Diaz-Gonzalez	7562610c7d	Fix output of dokku apps	2016-01-04 17:07:43 -05:00
Jose Diaz-Gonzalez	95d96ce1ab	Merge pull request #1822 from shingara/patch-1 --no-restart option after config:set not before	2016-01-04 16:55:58 -05:00
Cyril Mougel	16365a5a44	--no-restart option after config:set not before	2016-01-04 22:52:04 +01:00
Jose Diaz-Gonzalez	f13c77d50d	Merge pull request #1819 from andrewsomething/hostname-set-up Write out /home/dokku/HOSTNAME as specified by the web installer.	2016-01-04 13:52:30 -05:00
Andrew Starr-Bochicchio	245718f236	Write out /home/dokku/HOSTNAME as specified by the web installer.	2016-01-04 12:44:32 -05:00
Jose Diaz-Gonzalez	07aace9975	Merge pull request #1818 from dokku/josegonzalez-pre-receive Fix pre-receive git-hook	2016-01-04 11:21:10 -05:00
Jose Diaz-Gonzalez	244bb25e6a	Fix variable reference	2016-01-04 05:20:05 -05:00
Jose Diaz-Gonzalez	2a94bf267b	Fix pre-receive git-hook Closes #1817	2016-01-04 04:40:05 -05:00