Release 0.24.7

# History ## 0.24.7 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.24.7/bootstrap.sh sudo DOKKU_TAG=v0.24.7 bash bootstrap.sh ``` ### Bug Fixes - #4574: @Cellane Fix alternate-tags content & escaping ### Other - #4575: @Cellane Exclude additional ShellCheck tests
Merge pull request #4575 from Cellane/patch-2
2021-04-22 05:58:42 +00:00 · 2021-04-22 01:57:29 -04:00 · 2021-04-22 14:25:23 +09:00 · 2021-04-22 14:22:12 +09:00 · 2021-04-22 01:05:36 -04:00 · 2021-04-22 13:23:33 +09:00
65 changed files with 333 additions and 145 deletions
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -45,7 +45,7 @@ jobs:
        # 1.0.0 => d586102c117f97e63d7e3b56629d269efc9a7c60
        env:
          # keep in sync with tests/shellcheck-exclude
-          SHELLCHECK_OPTS: -e SC1001 -e SC1003 -e SC1090 -e SC1091 -e SC1117 -e SC2029 -e SC2034 -e SC2046 -e SC2064 -e SC2068 -e SC2086 -e SC2119 -e SC2120 -e SC2128 -e SC2148 -e SC2153 -e SC2154 -e SC2155 -e SC2162 -e SC2174 -e SC2179 -e SC2191 -e SC2199 -e SC2207 -e SC2219 -e SC2220 -e SC2230 -e SC2231 -e SC2235
+          SHELLCHECK_OPTS: -e SC1001 -e SC1003 -e SC1090 -e SC1091 -e SC1117 -e SC2029 -e SC2030 -e SC2031 -e SC2034 -e SC2046 -e SC2064 -e SC2068 -e SC2086 -e SC2119 -e SC2120 -e SC2128 -e SC2148 -e SC2153 -e SC2154 -e SC2155 -e SC2162 -e SC2174 -e SC2179 -e SC2191 -e SC2199 -e SC2207 -e SC2219 -e SC2220 -e SC2230 -e SC2231 -e SC2235 -e SC2267

  shfmt:
    name: shfmt
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,4 +84,4 @@ jobs:
          git config --global user.name 'Dokku Bot'
          git config --global user.email no-reply@dokku.com
          brew tap dokku/repo "https://$HOMEBREW_GITHUB_USERNAME:$HOMEBREW_GITHUB_API_TOKEN@github.com/dokku/homebrew-repo.git"
-          brew bump-formula-pr -f --no-browse --no-audit --no-fork --url "https://github.com/dokku/dokku/archive/${{ needs.release.outputs.version }}.tar.gz" dokku/repo/dokku
+          brew bump-formula-pr -f --no-browse --no-audit --no-fork --debug --verbose --url "https://github.com/dokku/dokku/archive/${{ needs.release.outputs.version }}.tar.gz" dokku/repo/dokku
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,70 @@
 # History

+## 0.24.7
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.24.7/bootstrap.sh
+sudo DOKKU_TAG=v0.24.7 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4574: @Cellane Fix alternate-tags content & escaping
+
+### Other
+
+- #4575: @Cellane Exclude additional ShellCheck tests
+
+## 0.24.6
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.24.6/bootstrap.sh
+sudo DOKKU_TAG=v0.24.6 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4493: @Cellane Ensure alternate-tags is properly injected for git:from-image deploys
+- #4563: @Akirtovskis Tough netrc file when setting git:auth entries
+- #4566: @jasiek Normalize Dockerfile line terminators to handle issues in port extraction
+- #4567: @josegonzalez Ensure plugin:update updates all plugins when no plugin is specified
+- #4568: @josegonzalez Do not insert log max-size when log-driver is set at daemon-level
+- #4554: @josegonzalez Ensure deployment task containers get associated to internal networks
+
+### New Features
+
+- #4557: @josegonzalez Add bash-completion to debian package recommends
+- #4484: @lunswor Bumps vector image version to 0.12.x
+
+### Other
+
+- #4569: @dependabot-preview[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 190 to 191 in /tests/apps/php
+
+## 0.24.5
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.24.5/bootstrap.sh
+sudo DOKKU_TAG=v0.24.5 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4552: @josegonzalez Scope return 301 in nginx config to allow proper letsencrypt usage
+
+### Documentation
+
+- #4546: @benwinding Add bad proxy ports to troubleshooting doc
+
+### Other
+
+- #4547: @dependabot[bot] chore(deps): bump django from 3.1.6 to 3.1.8 in /tests/apps/dockerfile-release
+
 ## 0.24.4

 Install/update via the bootstrap script:
--- a/README.md
+++ b/README.md
@@ -99,8 +99,8 @@ Otherwise, you will need to import the keypair manually after installation using
 To install the latest stable release, run the following commands as a user who has access to `sudo`:

 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.24.4/bootstrap.sh
-sudo DOKKU_TAG=v0.24.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.24.7/bootstrap.sh
+sudo DOKKU_TAG=v0.24.7 bash bootstrap.sh
 ```

 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -15,7 +15,7 @@ import subprocess
 import sys
 import threading

-VERSION = 'v0.24.4'
+VERSION = 'v0.24.7'

 def bytes_to_string(b):
    if type(b) == bytes:
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
 Package: dokku
-Version: 0.24.4
+Version: 0.24.7
 Section: web
 Priority: optional
 Architecture: amd64
 Depends: locales, git, cpio, curl, man-db, netcat, sshcommand (>= 0.12.0), docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-image-labeler (>= 0.2.2), net-tools, netrc, software-properties-common, procfile-util (>= 0.11.0), python-software-properties | python3-software-properties, rsyslog, dos2unix, jq, unzip
-Recommends: herokuish (>= 0.3.4), parallel, dokku-update, dokku-event-listener
+Recommends: herokuish (>= 0.3.4), bash-completion, parallel, dokku-update, dokku-event-listener
 Pre-Depends: gliderlabs-sigil, nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python3, debconf
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 Description: Docker-powered PaaS that helps build and manage the lifecycle of applications
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -35,35 +35,35 @@ dokku plugin:list

 ```
 plugn: dev
-  00_dokku-standard    0.24.4 enabled    dokku core standard plugin
-  20_events            0.24.4 enabled    dokku core events logging plugin
-  app-json             0.24.4 enabled    dokku core app-json plugin
-  apps                 0.24.4 enabled    dokku core apps plugin
-  build-env            0.24.4 enabled    dokku core build-env plugin
-  buildpacks           0.24.4 enabled    dokku core buildpacks plugin
-  certs                0.24.4 enabled    dokku core certificate management plugin
-  checks               0.24.4 enabled    dokku core checks plugin
-  common               0.24.4 enabled    dokku core common plugin
-  config               0.24.4 enabled    dokku core config plugin
-  docker-options       0.24.4 enabled    dokku core docker-options plugin
-  domains              0.24.4 enabled    dokku core domains plugin
-  enter                0.24.4 enabled    dokku core enter plugin
-  git                  0.24.4 enabled    dokku core git plugin
-  logs                 0.24.4 enabled    dokku core logs plugin
-  network              0.24.4 enabled    dokku core network plugin
-  nginx-vhosts         0.24.4 enabled    dokku core nginx-vhosts plugin
-  plugin               0.24.4 enabled    dokku core plugin plugin
-  proxy                0.24.4 enabled    dokku core proxy plugin
-  ps                   0.24.4 enabled    dokku core ps plugin
-  repo                 0.24.4 enabled    dokku core repo plugin
-  resource             0.24.4 enabled    dokku core resource plugin
-  scheduler-docker-local 0.24.4 enabled    dokku core scheduler-docker-local plugin
-  shell                0.24.4 enabled    dokku core shell plugin
-  ssh-keys             0.24.4 enabled    dokku core ssh-keys plugin
-  storage              0.24.4 enabled    dokku core storage plugin
-  tags                 0.24.4 enabled    dokku core tags plugin
-  tar                  0.24.4 enabled    dokku core tar plugin
-  trace                0.24.4 enabled    dokku core trace plugin
+  00_dokku-standard    0.24.7 enabled    dokku core standard plugin
+  20_events            0.24.7 enabled    dokku core events logging plugin
+  app-json             0.24.7 enabled    dokku core app-json plugin
+  apps                 0.24.7 enabled    dokku core apps plugin
+  build-env            0.24.7 enabled    dokku core build-env plugin
+  buildpacks           0.24.7 enabled    dokku core buildpacks plugin
+  certs                0.24.7 enabled    dokku core certificate management plugin
+  checks               0.24.7 enabled    dokku core checks plugin
+  common               0.24.7 enabled    dokku core common plugin
+  config               0.24.7 enabled    dokku core config plugin
+  docker-options       0.24.7 enabled    dokku core docker-options plugin
+  domains              0.24.7 enabled    dokku core domains plugin
+  enter                0.24.7 enabled    dokku core enter plugin
+  git                  0.24.7 enabled    dokku core git plugin
+  logs                 0.24.7 enabled    dokku core logs plugin
+  network              0.24.7 enabled    dokku core network plugin
+  nginx-vhosts         0.24.7 enabled    dokku core nginx-vhosts plugin
+  plugin               0.24.7 enabled    dokku core plugin plugin
+  proxy                0.24.7 enabled    dokku core proxy plugin
+  ps                   0.24.7 enabled    dokku core ps plugin
+  repo                 0.24.7 enabled    dokku core repo plugin
+  resource             0.24.7 enabled    dokku core resource plugin
+  scheduler-docker-local 0.24.7 enabled    dokku core scheduler-docker-local plugin
+  shell                0.24.7 enabled    dokku core shell plugin
+  ssh-keys             0.24.7 enabled    dokku core ssh-keys plugin
+  storage              0.24.7 enabled    dokku core storage plugin
+  tags                 0.24.7 enabled    dokku core tags plugin
+  tar                  0.24.7 enabled    dokku core tar plugin
+  trace                0.24.7 enabled    dokku core trace plugin
 ```

 > Warning: All plugin commands other than `plugin:list` and `plugin:help` require sudo access and must be run directly from the Dokku server.
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
  <msapplication>
    <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/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.jsdelivr.net\/dokku\/dokku@v0.24.4\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.7\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.4\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.7\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.4\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.7\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.4\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.7\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.4\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.7\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.4\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.24.7\/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
@@ -42,13 +42,13 @@ h1 {
  font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/dokku.png);
  text-indent: 40px;
 }
 .blurb {
  color: #424242;
  background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -21,6 +21,6 @@
    "0.21.4",
    "0.22.9",
    "0.23.9",
-    "0.24.4"
+    "0.24.7"
  ]
 }
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.24.4-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.24.7-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
--- a/docs/getting-started/install/docker.md
+++ b/docs/getting-started/install/docker.md
@@ -3,7 +3,7 @@
 Pull the dokku/dokku image:

 ```shell
-docker pull dokku/dokku:0.24.4
+docker pull dokku/dokku:0.24.7
 ```

 Next, run the image.
@@ -17,7 +17,7 @@ docker container run \
  --publish 8443:443 \
  --volume /var/lib/dokku:/mnt/dokku \
  --volume /var/run/docker.sock:/var/run/docker.sock \
-  dokku/dokku:0.24.4
+  dokku/dokku:0.24.7
 ```

 Dokku is run in the following configuration:
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c

 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.24.4/bootstrap.sh;
-sudo DOKKU_TAG=v0.24.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.24.7/bootstrap.sh;
+sudo DOKKU_TAG=v0.24.7 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
--- a/docs/getting-started/troubleshooting.md
+++ b/docs/getting-started/troubleshooting.md
@@ -236,3 +236,20 @@ This isn't usually an issue with Dokku, but rather an app config problem. This c
 In Rails at least, if your `application.rb` or `environmnents/production.rb` include the line `configure.force_ssl = true` which includes HSTS, try commenting that out and redeploying.

 If this solves the issue temporarily, longer term you should consider [configuring SSL](/docs/configuration/ssl.md).
+
+***
+
+__Symptom:__ My application deploys properly, but won't load in browser "connection refused"
+
+__Solution:__
+
+This could be a result of a bad proxy configuration (`http:5000:5000` may be incorrect). Run `dokku proxy:report myapp` to check if your app has the correct proxy configuration. It should show something like the following.
+
+```
+=====> myapp proxy information
+       Proxy enabled:                 true
+       Proxy port map:                http:80:5000 https:443:5000
+       Proxy type:                    nginx
+```
+
+Set `dokku proxy:ports-set front http:80:5000` to get proxy correctly configured for http endpoint.
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
    <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.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/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.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/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.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <style>
    </style>
@@ -98,12 +98,12 @@
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.24.4/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.24.7/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.24.4 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.24.7 bash bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
    <meta name="author" content="">
    <title>Dokku - {{DOC_TITLE}}</title>

-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/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.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <script>
@@ -42,7 +42,7 @@
    </script>

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.4/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.24.7/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
    <style>
--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/app-json/functions.go
+++ b/plugins/app-json/functions.go
@@ -415,7 +415,7 @@ func createdContainerID(appName string, dockerArgs []string, image string, comma
 	}

 	containerID := strings.TrimSpace(string(b))
-	err = common.PlugnTrigger("post-container-create", []string{"app", appName, containerID, phase}...)
+	err = common.PlugnTrigger("post-container-create", []string{"app", containerID, appName, phase}...)
 	return containerID, err
 }

--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/builder-dockerfile/builder-build
+++ b/plugins/builder-dockerfile/builder-build
@@ -20,6 +20,7 @@ trigger-builder-dockerfile-builder-build() {
  pushd "$SOURCECODE_WORK_DIR" &>/dev/null

  # extract first port from Dockerfile
+  dos2unix Dockerfile
  local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
  [[ -n "$DOCKERFILE_PORTS" ]] && config_set --no-restart "$APP" DOKKU_DOCKERFILE_PORTS="$DOCKERFILE_PORTS"
  plugn trigger pre-build-dockerfile "$APP"
--- a/plugins/builder-dockerfile/plugin.toml
+++ b/plugins/builder-dockerfile/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-dockerfile plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/builder-herokuish/plugin.toml
+++ b/plugins/builder-herokuish/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-herokuish plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/builder-pack/plugin.toml
+++ b/plugins/builder-pack/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-pack plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/builder/plugin.toml
+++ b/plugins/builder/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/buildpacks/plugin.toml
+++ b/plugins/buildpacks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core buildpacks plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/common/property-functions
+++ b/plugins/common/property-functions
@@ -10,7 +10,7 @@ fn-plugin-property-get() {
 }

 fn-plugin-property-clone() {
-  declare desc="destroy the properties for an app"
+  declare desc="clone the properties for an app"
  declare PLUGIN="$1" OLD_APP="$2" NEW_APP="$3"
  "$PLUGIN_CORE_AVAILABLE_PATH/common/prop" "clone" "$PLUGIN" "$OLD_APP" "$NEW_APP"
 }
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/cron/plugin.toml
+++ b/plugins/cron/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core cron plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/git/internal-functions
+++ b/plugins/git/internal-functions
@@ -116,6 +116,7 @@ cmd-git-auth() {
  fi

  dokku_log_info1 "Setting netrc auth entry for host $HOST"
+  touch "${DOKKU_ROOT}/.netrc"
  netrc set "$HOST" "$USERNAME" "$PASSWORD"
 }

@@ -166,7 +167,8 @@ cmd-git-from-image() {

  dokku_log_verbose "Setting Dockerfile"
  touch "$TMP_WORK_DIR/Dockerfile"
-  echo "FROM $DOCKER_IMAGE" >"$TMP_WORK_DIR/Dockerfile"
+  echo "FROM $DOCKER_IMAGE" >>"$TMP_WORK_DIR/Dockerfile"
+  echo "LABEL com.dokku.docker-image-labeler/alternate-tags=[\\\"$DOCKER_IMAGE\\\"]" >>"$TMP_WORK_DIR/Dockerfile"

  plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
 }
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/logs/logs.go
+++ b/plugins/logs/logs.go
@@ -24,7 +24,7 @@ var (
 )

 // VectorImage contains the default vector image to run
-const VectorImage = "timberio/vector:0.11.X-debian"
+const VectorImage = "timberio/vector:0.12.X-debian"

 // GetFailedLogs outputs failed deploy logs for a given app
 func GetFailedLogs(appName string) error {
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/logs/triggers.go
+++ b/plugins/logs/triggers.go
@@ -10,6 +10,8 @@ import (

 	"github.com/dokku/dokku/plugins/common"
 	dockeroptions "github.com/dokku/dokku/plugins/docker-options"
+
+	sh "github.com/codeskyblue/go-sh"
 )

 // TriggerDockerArgsProcessDeploy outputs the logs plugin docker options for an app
@@ -30,11 +32,13 @@ func TriggerDockerArgsProcessDeploy(appName string) error {
 		return err
 	}

+	hasDriverOpt := false
 	for _, option := range options {
 		if !strings.HasPrefix(option, "--log-driver=") {
 			continue
 		}

+		hasDriverOpt = true
 		logDriver := strings.TrimPrefix(option, "--log-driver=")
 		if !allowedDrivers[logDriver] {
 			ignoreMaxSize = true
@@ -42,6 +46,14 @@ func TriggerDockerArgsProcessDeploy(appName string) error {
 		break
 	}

+	if !hasDriverOpt {
+		b, _ := sh.Command(common.DockerBin(), "system", "info", "--format", "{{ .LoggingDriver }}").Output()
+		output := strings.TrimSpace(string(b[:]))
+		if !allowedDrivers[output] {
+			ignoreMaxSize = true
+		}
+	}
+
 	if !ignoreMaxSize {
 		maxSize := common.PropertyGet("logs", appName, "max-size")
 		if maxSize == "" {
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/nginx-vhosts/templates/nginx.conf.sigil
+++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil
@@ -12,7 +12,10 @@ server {
  access_log  {{ $.NGINX_ACCESS_LOG_PATH }}{{ if and ($.NGINX_ACCESS_LOG_FORMAT) (ne $.NGINX_ACCESS_LOG_PATH "off") }} {{ $.NGINX_ACCESS_LOG_FORMAT }}{{ end }};
  error_log   {{ $.NGINX_ERROR_LOG_PATH }};
 {{ if (and (eq $listen_port "80") ($.SSL_INUSE)) }}
-  return 301 https://$host:{{ $.PROXY_SSL_PORT }}$request_uri;
+  include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
+  location / {
+    return 301 https://$host:{{ $.PROXY_SSL_PORT }}$request_uri;
+  }
 {{ else }}
  location    / {

--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/plugin/subcommands/update
+++ b/plugins/plugin/subcommands/update
@@ -23,6 +23,18 @@ cmd-plugin-update() {
    fi

    plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
+  else
+    pushd "$PLUGIN_ENABLED_PATH" >/dev/null
+    for PLUGIN in *; do
+      if [[ -d "${PLUGIN}" ]]; then
+        if fn-is-core-plugin "${PLUGIN}"; then
+          continue
+        fi
+
+        plugn update "$PLUGIN"
+      fi
+    done
+    popd &>/dev/null || pushd "/tmp" >/dev/null
  fi

  plugn trigger update
--- a/plugins/proxy/functions
+++ b/plugins/proxy/functions
@@ -8,7 +8,7 @@ is_app_proxy_enabled() {
  declare desc="return true if proxy is enabled; otherwise return false"
  declare APP="$1"
  declare deprecated=true
-  dokku_log_warn "Deprecated: plugn#proxy-is-enabled"
+  dokku_log_warn "Deprecated: Use plugn#proxy-is-enabled"

  plugn trigger proxy-is-enabled "$APP"
 }
@@ -17,7 +17,7 @@ get_app_proxy_type() {
  declare desc="return app proxy type"
  declare APP="$1"
  declare deprecated=true
-  dokku_log_warn "Deprecated: plugn#proxy-type"
+  dokku_log_warn "Deprecated: Use plugn#proxy-type"

  plugn trigger proxy-type "$APP"
 }
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/resource/plugin.toml
+++ b/plugins/resource/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core resource plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/storage/functions
+++ b/plugins/storage/functions
@@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 verify_paths() {
  declare desc="verifies storage paths"
  local -r passed_path=$1
-  if [[ "$passed_path" = /* ]]; then
+  if [[ "$passed_path" == /* ]]; then
    echo "$passed_path" | grep -qe '^/.*\:/' || dokku_log_fail "Storage path must be two valid paths divided by colon."
  else
    echo "$passed_path" | grep -qe '^[a-zA-Z0-9]\{1\}[a-zA-Z0-9_.-]\+\:\/' || dokku_log_fail "Volume name must be two characters or more. Volume name must not contain invalid characters. Storage path must be two valid paths divided by colon."
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/plugins/trace/plugin.toml
+++ b/plugins/trace/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core trace plugin"
-version = "0.24.4"
+version = "0.24.7"
 [plugin.config]
--- a/tests/apps/dockerfile-release/Pipfile.lock
+++ b/tests/apps/dockerfile-release/Pipfile.lock
@@ -18,10 +18,10 @@
    "default": {
        "asgiref": {
            "hashes": [
-                "sha256:5ee950735509d04eb673bd7f7120f8fa1c9e2df495394992c73234d526907e17",
-                "sha256:7162a3cb30ab0609f1a4c95938fd73e8604f63bdba516a7f7d64b83ff09478f0"
+                "sha256:92906c611ce6c967347bbfea733f13d6313901d54dcca88195eaeb52b2a8e8ee",
+                "sha256:d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78"
            ],
-            "version": "==3.3.1"
+            "version": "==3.3.4"
        },
        "dj-database-url": {
            "hashes": [
@@ -33,11 +33,11 @@
        },
        "django": {
            "hashes": [
-                "sha256:169e2e7b4839a7910b393eec127fd7cbae62e80fa55f89c6510426abf673fe5f",
-                "sha256:c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7"
+                "sha256:c348b3ddc452bf4b62361f0752f71a339140c777ebea3cdaaaa8fdb7f417a862",
+                "sha256:f8393103e15ec2d2d313ccbb95a3f1da092f9f58d74ac1c61ca2ac0436ae1eac"
            ],
            "index": "pypi",
-            "version": "==3.1.6"
+            "version": "==3.1.8"
        },
        "djangorestframework": {
            "hashes": [
--- a/tests/apps/php/composer.lock
+++ b/tests/apps/php/composer.lock
@@ -1000,16 +1000,16 @@
    "packages-dev": [
        {
            "name": "heroku/heroku-buildpack-php",
-            "version": "v190",
+            "version": "v191",
            "source": {
                "type": "git",
                "url": "https://github.com/heroku/heroku-buildpack-php.git",
-                "reference": "3e49045a63ed480378c9d3d3e364acbfcc06eb3f"
+                "reference": "2acb8a055fa96289645d4b77a68a6cd41d67767c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/3e49045a63ed480378c9d3d3e364acbfcc06eb3f",
-                "reference": "3e49045a63ed480378c9d3d3e364acbfcc06eb3f",
+                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/2acb8a055fa96289645d4b77a68a6cd41d67767c",
+                "reference": "2acb8a055fa96289645d4b77a68a6cd41d67767c",
                "shasum": ""
            },
            "bin": [
@@ -1037,7 +1037,7 @@
                "nginx",
                "php"
            ],
-            "time": "2021-03-04T23:15:04+00:00"
+            "time": "2021-04-15T19:49:01+00:00"
        }
    ],
    "aliases": [],
--- a/tests/shellcheck-exclude
+++ b/tests/shellcheck-exclude
@@ -4,9 +4,11 @@
 # SC1091 - Not following: FILE: does not exist (No such file or directory) - https://github.com/koalaman/shellcheck/wiki/SC1091
 # SC1117 - Backslash is literal in "\n". Prefer explicit escaping: "\\n" - https://github.com/koalaman/shellcheck/wiki/SC1117
 # SC2029 - Note that, unescaped, this expands on the client side - https://github.com/koalaman/shellcheck/wiki/SC2029
+# SC2030 - Modification of var is local (to subshell caused by pipeline). - https://github.com/koalaman/shellcheck/wiki/SC2030
+# SC2031 - var was modified in a subshell. That change might be lost. - https://github.com/koalaman/shellcheck/wiki/SC2031
 # SC2034 - VAR appears unused - https://github.com/koalaman/shellcheck/wiki/SC2034
 # SC2046 - Quote this to prevent word splitting - https://github.com/koalaman/shellcheck/wiki/SC2046
-# SC2064 - Use single quotes, otherwise this expands now rather than when signalled.
+# SC2064 - Use single quotes, otherwise this expands now rather than when signalled. - https://github.com/koalaman/shellcheck/wiki/SC2064
 # SC2068 - Double quote array expansions to avoid re-splitting elements - https://github.com/koalaman/shellcheck/wiki/SC2068
 # SC2086 - Double quote to prevent globbing and word splitting - https://github.com/koalaman/shellcheck/wiki/SC2086
 # SC2119 - Use 'function "$@"' if function's $1 should mean script's $1 - https://github.com/koalaman/shellcheck/wiki/SC2119
@@ -27,3 +29,4 @@
 # SC2230 - which is non-standard. Use builtin 'command -v' instead - https://github.com/koalaman/shellcheck/wiki/SC2230
 # SC2231 - Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt  - https://github.com/koalaman/shellcheck/wiki/SC2231
 # SC2235 - Use { ..; } instead of (..) to avoid subshell overhead - https://github.com/koalaman/shellcheck/wiki/SC2235
+# SC2267 - GNU xargs -i is deprecated in favor of -I{} - https://github.com/koalaman/shellcheck/wiki/SC2267
--- a/tests/unit/git_4.bats
+++ b/tests/unit/git_4.bats
@@ -116,3 +116,16 @@ EOF
  echo "status: $status"
  assert_failure
 }
+
+@test "(git) git:from-image labels correctly" {
+  run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "docker image inspect dokku/$TEST_APP:latest --format '{{ index .Config.Labels \"com.dokku.docker-image-labeler/alternate-tags\" }}'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "linuxserver/foldingathome:7.5.1-ls1"
+}
--- a/tests/unit/logs.bats
+++ b/tests/unit/logs.bats
@@ -369,6 +369,66 @@ teardown() {
  assert_output "10m"
 }

+@test "(logs) logs:set max-size with alternate log-driver daemon " {
+  driver="$(jq -r '."log-driver"' /etc/docker/daemon.json)"
+  local TMP_FILE=$(mktemp "/tmp/dokku.me.XXXX")
+
+  run create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku logs:set $TEST_APP max-size 20m 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Setting max-size"
+
+  run /bin/bash -c "echo '' | dokku plugin:trigger docker-args-process-deploy $TEST_APP 2>&1 | xargs"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "--log-opt=max-size=20m"
+
+  DRIVER="journald" jq '."log-driver" = env.DRIVER' <"/etc/docker/daemon.json" >"$TMP_FILE"
+  mv "$TMP_FILE" /etc/docker/daemon.json
+
+  sudo service docker restart
+
+  run /bin/bash -c "dokku logs:set $TEST_APP max-size 20m 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Setting max-size"
+
+  run /bin/bash -c "echo '' | dokku plugin:trigger docker-args-process-deploy $TEST_APP 2>&1 | xargs"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_exists
+
+  if [[ "$driver" = "null" ]]; then
+    DRIVER="$driver" jq 'del(."log-driver")' <"/etc/docker/daemon.json" >"$TMP_FILE"
+  else
+    DRIVER="$driver" jq '."log-driver" = env.DRIVER' <"/etc/docker/daemon.json" >"$TMP_FILE"
+  fi
+
+  mv "$TMP_FILE" /etc/docker/daemon.json
+  sudo service docker restart
+
+  run /bin/bash -c "dokku logs:set $TEST_APP max-size 20m 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Setting max-size"
+
+  run /bin/bash -c "echo '' | dokku plugin:trigger docker-args-process-deploy $TEST_APP 2>&1 | xargs"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "--log-opt=max-size=20m"
+}
+
@test "(logs) logs:set max-size with alternate log-driver" {
  run create_app
  echo "output: $output"
Author	SHA1	Message	Date
Dokku Bot	496ea86840	Release 0.24.7 # History ## 0.24.7 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.24.7/bootstrap.sh sudo DOKKU_TAG=v0.24.7 bash bootstrap.sh ``` ### Bug Fixes - #4574: @Cellane Fix alternate-tags content & escaping ### Other - #4575: @Cellane Exclude additional ShellCheck tests	2021-04-22 05:58:42 +00:00
Jose Diaz-Gonzalez	b3854eb2c3	Merge pull request #4575 from Cellane/patch-2 Exclude additional ShellCheck tests	2021-04-22 01:57:29 -04:00
Milan Vit	2be6c8b86d	Add explanation for exclusion	2021-04-22 14:25:23 +09:00
Milan Vit	3db6dbfcb3	Exclude additional ShellCheck tests	2021-04-22 14:22:12 +09:00
Jose Diaz-Gonzalez	dfd55d0eb0	Merge pull request #4574 from Cellane/patch-1 Fix alternate-tags content & escaping	2021-04-22 01:05:36 -04:00
Milan Vit	ca6ac610a2	Fix alternate-tags content & escaping	2021-04-22 13:23:33 +09:00
Dokku Bot	b943edcd24	Release 0.24.6 # History ## 0.24.6 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.24.6/bootstrap.sh sudo DOKKU_TAG=v0.24.6 bash bootstrap.sh ``` ### Bug Fixes - #4493: @Cellane Ensure alternate-tags is properly injected for git:from-image deploys - #4563: @Akirtovskis Tough netrc file when setting git:auth entries - #4566: @jasiek Normalize Dockerfile line terminators to handle issues in port extraction - #4567: @josegonzalez Ensure plugin:update updates all plugins when no plugin is specified - #4568: @josegonzalez Do not insert log max-size when log-driver is set at daemon-level - #4554: @josegonzalez Ensure deployment task containers get associated to internal networks ### New Features - #4557: @josegonzalez Add bash-completion to debian package recommends - #4484: @lunswor Bumps vector image version to 0.12.x ### Other - #4569: @dependabot-preview[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 190 to 191 in /tests/apps/php	2021-04-17 01:53:29 +00:00
Jose Diaz-Gonzalez	03ff6e9824	add verbose debugging to formula releasing	2021-04-16 14:45:54 -04:00
Jose Diaz-Gonzalez	7847c8b99c	Merge pull request #4493 from Cellane/add-failing-test-for-image-labeling Ensure alternate-tags is properly injected for git:from-image deploys	2021-04-16 14:37:55 -04:00
Jose Diaz-Gonzalez	8660d58eb0	fix: inject alternate label when building from an image This label is otherwise missing, causing tooling that might want to know about it's pre-existing labels - specifically, docker-image-labeler - to fail to run as expected.	2021-04-16 12:28:56 -04:00
Jose Diaz-Gonzalez	9de027167d	tests: make test a bit clearer	2021-04-16 12:28:56 -04:00
Milan Vit	65095fa4f7	💚 Alter tests further	2021-04-16 12:28:56 -04:00
Milan Vit	f07f489ef6	💚 Break test by fixing it	2021-04-16 12:28:56 -04:00
Milan Vit	15f4e94b4f	✅ Add (hopefully) failing test for image labeling	2021-04-16 12:28:56 -04:00
Jose Diaz-Gonzalez	6d66590fd4	Merge pull request #4563 from Akirtovskis/add-and-remove-netrc-for-git-auth Tough netrc file when setting git:auth entries	2021-04-16 12:28:20 -04:00
Jose Diaz-Gonzalez	cc1e9562b0	Merge pull request #4566 from jasiek/master Normalize Dockerfile line terminators to handle issues in port extraction	2021-04-16 12:27:45 -04:00
Jose Diaz-Gonzalez	ecad66bf22	Merge pull request #4567 from dokku/4553-plugin-update Ensure plugin:update updates all plugins when no plugin is specified	2021-04-16 12:26:43 -04:00
Jose Diaz-Gonzalez	d8ae1bd06c	Merge pull request #4568 from dokku/4519-respect-daemon-log-settings Do not insert log max-size when log-driver is set at daemon-level	2021-04-16 12:26:34 -04:00
Jose Diaz-Gonzalez	1679024926	Merge pull request #4569 from dokku/dependabot/composer/tests/apps/php/heroku/heroku-buildpack-php-191 chore(deps-dev): bump heroku/heroku-buildpack-php from 190 to 191 in /tests/apps/php	2021-04-16 12:26:22 -04:00
dependabot-preview[bot]	690233c02b	chore(deps-dev): bump heroku/heroku-buildpack-php in /tests/apps/php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 190 to 191. - [Release notes](https://github.com/heroku/heroku-buildpack-php/releases) - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v190...v191) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-04-16 06:26:56 +00:00
Jose Diaz-Gonzalez	4cccaebac5	fix: do not insert log max-size when log-driver is set at daemon-level Closes #4519	2021-04-16 01:54:44 -04:00
Jose Diaz-Gonzalez	42e9164050	fix: ensure plugin:update updates all plugins when no plugin is specified Closes #4553	2021-04-16 01:00:53 -04:00
Jan Szumiec	4af837b987	Some Dockerfiles will have CRLF line terminators which will prevent us from parsing EXPOSE directives.	2021-04-15 21:28:46 +02:00
Jan Szumiec	a23a7c4488	Fixed a linter warning.	2021-04-15 07:05:00 +02:00
arturs	46c4a93468	chore(plugins): remove unnecessary command	2021-04-14 22:00:28 +03:00
arturs	84daf1ae52	fix(plugins): add touch netrc and remove netrc in git auth fn	2021-04-14 21:41:33 +03:00
Jose Diaz-Gonzalez	be01d2f7ec	Merge pull request #4557 from dokku/4538-bash-completion Add bash-completion to debian package recommends	2021-04-14 06:11:41 -04:00
Jose Diaz-Gonzalez	9273e634ce	Merge pull request #4484 from lunswor/bump-vector-image Bumps vector image version	2021-04-14 05:43:42 -04:00
Jose Diaz-Gonzalez	dd9d5d67a1	feat: add bash-completion to debian package recommends We're skipping adding this to the yum package as we're going to start phasing out support for non-debian hosts in favor of installing via the Docker image. Closes #4538	2021-04-14 05:40:54 -04:00
Jose Diaz-Gonzalez	f5dda60e5b	Merge pull request #4554 from dokku/josegonzalez-patch-1 Ensure deployment task containers get associated to internal networks	2021-04-14 05:35:13 -04:00
Jose Diaz-Gonzalez	578f6e7ba5	fix: ensure deployment task containers get associated to internal networks Closes #4543	2021-04-13 19:47:45 -04:00
Dokku Bot	22464734da	Release 0.24.5 # History ## 0.24.5 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.24.5/bootstrap.sh sudo DOKKU_TAG=v0.24.5 bash bootstrap.sh ``` ### Bug Fixes - #4552: @josegonzalez Scope return 301 in nginx config to allow proper letsencrypt usage ### Documentation - #4546: @benwinding Add bad proxy ports to troubleshooting doc ### Other - #4547: @dependabot[bot] chore(deps): bump django from 3.1.6 to 3.1.8 in /tests/apps/dockerfile-release	2021-04-13 20:34:17 +00:00
Jose Diaz-Gonzalez	ee1f7fb6b9	Merge pull request #4546 from benwinding/master Add bad proxy ports to troubleshooting doc	2021-04-13 14:46:35 -04:00
Jose Diaz-Gonzalez	fc3cdd06af	Merge pull request #4547 from dokku/dependabot/pip/tests/apps/dockerfile-release/django-3.1.8 chore(deps): bump django from 3.1.6 to 3.1.8 in /tests/apps/dockerfile-release	2021-04-13 14:42:40 -04:00
Jose Diaz-Gonzalez	1668e4bc57	Merge pull request #4552 from dokku/letsencrypt-ssl-fixes Scope return 301 in nginx config to allow proper letsencrypt usage	2021-04-13 14:38:33 -04:00
Jose Diaz-Gonzalez	f4a0dca15b	fix: scope return 301 in nginx config to allow proper letsencrypt usage	2021-04-13 13:26:49 -04:00
Jose Diaz-Gonzalez	45417753a2	fix: correct description	2021-04-13 13:26:23 -04:00
Jose Diaz-Gonzalez	0967dc2130	fix: update deprecation warnings	2021-04-13 13:26:14 -04:00
dependabot[bot]	d48936eb79	chore(deps): bump django in /tests/apps/dockerfile-release Bumps [django](https://github.com/django/django) from 3.1.6 to 3.1.8. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/3.1.6...3.1.8) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-08 19:51:15 +00:00
Ben Winding	f5ff9f0997	Update troubleshooting.md	2021-04-05 23:39:31 +09:30
Lee Unsworth	ae6452e6e4	Bumps vector image version	2021-03-15 08:55:28 +00:00