Release 0.26.7

# History ## 0.26.7 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh ``` ### Bug Fixes - #5003: @josegonzalez Respect pre-existing .env files when preparing the herokuish buildenv - #4950: @emdienn Use exported environment vars during pack build - #4999: @elhu Purge cache for all apps when calling buildpacks:set-property with --global flag - #4988: @fomojola Conditionally restart NGINX - #4922: @josegonzalez Gitignore more built plugin triggers in apps plugin ### New Features - #4964: @josegonzalez Add log message when running state is false - #4970: @josegonzalez Log the string error and not bytes when there is an issue updating the cron schedule - #4924: @josegonzalez Update devcontainer to include aliased go packages - #4920: @josegonzalez Ensure related go source and vscode plugins are installed in devcontainer ### Documentation - #4949: @IlyaSemenov docs: update herokuish upgrade instructions - #4992: @anthonyshew Typo for deploying using image SHA - #4976: @josegonzalez Update link in header to dokku pro - #4972: @Dam-Buty Clarify cron:report command - #4943: @Stormheg Fix typo in registry management documentation - #4935: @josegonzalez Reword note about env vars in nginx config templates ### Other - #4995: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 203 to 205 in /tests/apps/php - #4978: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 201 to 203 in /tests/apps/php - #4936: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 200 to 201 in /tests/apps/php - #4937: @dependabot[bot] chore(deps): bump socket.io from 4.3.2 to 4.4.0 in /tests/apps/.websocket.disabled
Merge pull request #5003 from dokku/4894-dotenv
2022-01-18 09:35:34 +00:00 · 2022-01-18 04:06:52 -05:00 · 2022-01-18 02:21:12 -05:00 · 2022-01-16 18:23:56 -05:00 · 2022-01-15 08:44:02 -05:00 · 2022-01-15 08:39:53 -05:00
78 changed files with 343 additions and 164 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -7,6 +7,12 @@ RUN apt-get install --no-install-recommends -y build-essential file nano && \
  apt-get autoremove --yes && \
  rm -rf /var/lib/apt/lists/*

+RUN wget https://dl.google.com/go/go1.16.10.linux-amd64.tar.gz && \
+  tar -xvf go1.16.10.linux-amd64.tar.gz && \
+  mv go /usr/local
+
+RUN GOROOT=/usr/local/go /usr/local/go/bin/go install golang.org/x/tools/gopls@latest 2>&1
+
 ADD https://raw.githubusercontent.com/dokku/dokku/master/tests/dhparam.pem /mnt/dokku/etc/nginx/dhparam.pem

 COPY .devcontainer/bin/ /usr/local/bin/
@@ -15,5 +21,6 @@ RUN make ci-dependencies

 COPY . .

-ENV DOKKU_HOSTNAME=dokku.me
+ENV DOKKU_HOSTNAME=dokku.me GOROOT=/usr/local/go PATH=/usr/local/go/bin:$PATH PLUGIN_MAKE_TARGET=build
+
 LABEL org.label-schema.schema-version=1.0 org.label-schema.vendor=dokku com.dokku.devcontainer=true
--- a/.devcontainer/bin/copy-plugin
+++ b/.devcontainer/bin/copy-plugin
@@ -3,7 +3,7 @@
 main() {
  declare PLUGIN_NAME="$1"

-  make go-build-plugin copyplugin PLUGIN_NAME=$PLUGIN_NAME
+  make go-build-plugin copyplugin PLUGIN_NAME=$PLUGIN_NAME PLUGIN_MAKE_TARGET=build
 }

 main "$@"
--- a/.devcontainer/bin/go-mod-downloadall
+++ b/.devcontainer/bin/go-mod-downloadall
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -x
+
+main() {
+  find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do
+    if [[ ! -f "plugins/$plugin/go.mod" ]]; then
+      continue
+    fi
+
+    pushd "plugins/$plugin" >/dev/null || return 1
+    echo "====> Cloning all modules $plugin"
+    go list -m -f '{{define "M"}}git clone https://{{.Path}}.git /root/go/src/{{.Path}} || true{{end}}{{if not .Main}}{{if not .Replace}}{{template "M" .}}{{end}}{{end}}' all >tmp-file
+    bash tmp-file
+    rm tmp-file
+    popd >/dev/null || return 1
+  done
+
+  git clone --branch v2 https://github.com/go-yaml/yaml.git /root/go/src/gopkg.in/yaml.v2 || true
+  git clone --branch v3 https://github.com/robfig/cron /root/go/src/github.com/robfig/cron/v3 || true
+  git clone https://github.com/golang/net /root/go/src/golang.org/x/net || true
+  git clone https://github.com/golang/protobuf.git /root/go/src/github.com/golang/protobuf || true
+  git clone https://github.com/golang/sync /root/go/src/golang.org/x/sync || true
+  git clone https://github.com/golang/sys.git /root/go/src/golang.org/x/sys || true
+  git clone https://github.com/golang/text.git /root/go/src/golang.org/x/text || true
+  git clone https://github.com/googleapis/go-genproto.git /root/go/src/google.golang.org/genproto || true
+  git clone https://github.com/grpc/grpc-go.git /root/go/src/google.golang.org/grpc || true
+  git clone https://github.com/onsi/gomega /root/go/src/github.com/onsi/gomega || true
+  git clone https://github.com/protocolbuffers/protobuf-go.git /root/go/src/google.golang.org/protobuf || true
+}
+
+main "$@"
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,12 +7,19 @@
    "DOKKU_HOST_ROOT": "${localWorkspaceFolder}/tmp/data/home/dokku",
    "GO_ROOT_MOUNT": "${localWorkspaceFolder}:/go/src/github.com/dokku/dokku"
  },
+  "extensions": [
+    "golang.go",
+    "mads-hartmann.bash-ide-vscode",
+    "ms-vscode.makefile-tools"
+  ],
  "initializeCommand": ["mkdir", "-p", "tmp/data"],
  "mounts": [
    "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
    "source=${localWorkspaceFolder}/tmp/data/,target=/mnt/dokku/,type=bind"
  ],
  "overrideCommand": false,
-  "postCreateCommand": ["make", "setup-deploy-tests"],
-  "runArgs": ["--init"]
+  "postCreateCommand": "make setup-deploy-tests && go-mod-downloadall",
+  "runArgs": ["--init"],
+  "workspaceFolder": "/root/go/src/github.com/dokku/dokku",
+  "workspaceMount": "type=bind,source=${localWorkspaceFolder},target=/root/go/src/github.com/dokku/dokku,consistency=cached"
 }
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -83,6 +83,8 @@ jobs:
        run: |
          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"
+          curl -sSL https://github.com/dokku/netrc/releases/download/v0.4.1/netrc_0.4.1_darwin_x86_64.tgz | tar xvf -
+          mv netrc /usr/local/bin/netrc
+          netrc set github.com "$HOMEBREW_GITHUB_USERNAME" "$HOMEBREW_GITHUB_API_TOKEN"
          brew tap dokku/repo
          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/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .DS_Store
 .ruby-version
 .idea/
+.vscode/
 .vagrant
 build/
 data/
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,59 @@
 # History

+## 0.26.7
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh
+sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #5003: @josegonzalez Respect pre-existing .env files when preparing the herokuish buildenv
+- #4950: @emdienn Use exported environment vars during pack build
+- #4999: @elhu Purge cache for all apps when calling buildpacks:set-property with --global flag
+- #4988: @fomojola Conditionally restart NGINX
+- #4922: @josegonzalez Gitignore more built plugin triggers in apps plugin
+
+### New Features
+
+- #4964: @josegonzalez Add log message when running state is false
+- #4970: @josegonzalez Log the string error and not bytes when there is an issue updating the cron schedule
+- #4924: @josegonzalez Update devcontainer to include aliased go packages
+- #4920: @josegonzalez Ensure related go source and vscode plugins are installed in devcontainer
+
+### Documentation
+
+- #4949: @IlyaSemenov docs: update herokuish upgrade instructions
+- #4992: @anthonyshew Typo for deploying using image SHA
+- #4976: @josegonzalez Update link in header to dokku pro
+- #4972: @Dam-Buty Clarify cron:report command
+- #4943: @Stormheg Fix typo in registry management documentation
+- #4935: @josegonzalez Reword note about env vars in nginx config templates
+
+### Other
+
+- #4995: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 203 to 205 in /tests/apps/php
+- #4978: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 201 to 203 in /tests/apps/php
+- #4936: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 200 to 201 in /tests/apps/php
+- #4937: @dependabot[bot] chore(deps): bump socket.io from 4.3.2 to 4.4.0 in /tests/apps/.websocket.disabled
+
+## 0.26.6
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh
+sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #4919: @nerg4l fix: do not validate global flag as an app name
+- #4918: @josegonzalez Use netrc binary to properly release dokku client homebrew formula
+
 ## 0.26.5

 Install/update via the bootstrap script:
--- a/README.md
+++ b/README.md
@@ -98,8 +98,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.26.5/bootstrap.sh
-sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh
+sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh
 ```

 You can then proceed to configure your server domain (via `dokku domains:set-global`) and user access (via `dokku ssh-keys:add`) to complete the installation.
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.26.5
+Version: 0.26.7
 Section: web
 Priority: optional
 Architecture: amd64
--- 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.26.5 enabled    dokku core standard plugin
-  20_events            0.26.5 enabled    dokku core events logging plugin
-  app-json             0.26.5 enabled    dokku core app-json plugin
-  apps                 0.26.5 enabled    dokku core apps plugin
-  build-env            0.26.5 enabled    dokku core build-env plugin
-  buildpacks           0.26.5 enabled    dokku core buildpacks plugin
-  certs                0.26.5 enabled    dokku core certificate management plugin
-  checks               0.26.5 enabled    dokku core checks plugin
-  common               0.26.5 enabled    dokku core common plugin
-  config               0.26.5 enabled    dokku core config plugin
-  docker-options       0.26.5 enabled    dokku core docker-options plugin
-  domains              0.26.5 enabled    dokku core domains plugin
-  enter                0.26.5 enabled    dokku core enter plugin
-  git                  0.26.5 enabled    dokku core git plugin
-  logs                 0.26.5 enabled    dokku core logs plugin
-  network              0.26.5 enabled    dokku core network plugin
-  nginx-vhosts         0.26.5 enabled    dokku core nginx-vhosts plugin
-  plugin               0.26.5 enabled    dokku core plugin plugin
-  proxy                0.26.5 enabled    dokku core proxy plugin
-  ps                   0.26.5 enabled    dokku core ps plugin
-  repo                 0.26.5 enabled    dokku core repo plugin
-  resource             0.26.5 enabled    dokku core resource plugin
-  scheduler-docker-local 0.26.5 enabled    dokku core scheduler-docker-local plugin
-  shell                0.26.5 enabled    dokku core shell plugin
-  ssh-keys             0.26.5 enabled    dokku core ssh-keys plugin
-  storage              0.26.5 enabled    dokku core storage plugin
-  tags                 0.26.5 enabled    dokku core tags plugin
-  tar                  0.26.5 enabled    dokku core tar plugin
-  trace                0.26.5 enabled    dokku core trace plugin
+  00_dokku-standard    0.26.7 enabled    dokku core standard plugin
+  20_events            0.26.7 enabled    dokku core events logging plugin
+  app-json             0.26.7 enabled    dokku core app-json plugin
+  apps                 0.26.7 enabled    dokku core apps plugin
+  build-env            0.26.7 enabled    dokku core build-env plugin
+  buildpacks           0.26.7 enabled    dokku core buildpacks plugin
+  certs                0.26.7 enabled    dokku core certificate management plugin
+  checks               0.26.7 enabled    dokku core checks plugin
+  common               0.26.7 enabled    dokku core common plugin
+  config               0.26.7 enabled    dokku core config plugin
+  docker-options       0.26.7 enabled    dokku core docker-options plugin
+  domains              0.26.7 enabled    dokku core domains plugin
+  enter                0.26.7 enabled    dokku core enter plugin
+  git                  0.26.7 enabled    dokku core git plugin
+  logs                 0.26.7 enabled    dokku core logs plugin
+  network              0.26.7 enabled    dokku core network plugin
+  nginx-vhosts         0.26.7 enabled    dokku core nginx-vhosts plugin
+  plugin               0.26.7 enabled    dokku core plugin plugin
+  proxy                0.26.7 enabled    dokku core proxy plugin
+  ps                   0.26.7 enabled    dokku core ps plugin
+  repo                 0.26.7 enabled    dokku core repo plugin
+  resource             0.26.7 enabled    dokku core resource plugin
+  scheduler-docker-local 0.26.7 enabled    dokku core scheduler-docker-local plugin
+  shell                0.26.7 enabled    dokku core shell plugin
+  ssh-keys             0.26.7 enabled    dokku core ssh-keys plugin
+  storage              0.26.7 enabled    dokku core storage plugin
+  tags                 0.26.7 enabled    dokku core tags plugin
+  tar                  0.26.7 enabled    dokku core tar plugin
+  trace                0.26.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/advanced-usage/registry-management.md
+++ b/docs/advanced-usage/registry-management.md
@@ -103,7 +103,7 @@ dokku registry:set node-js-app push-on-release

 ### Pushing images on build

-To push the image on release, set the `push-on-release` property to `true` via the `registry:set` command. The default value for this property is `false`. Setting the property to `true` will result in the imag being tagged with an ID that is incremented with every release. This tag will be what is used for running app code.
+To push the image on release, set the `push-on-release` property to `true` via the `registry:set` command. The default value for this property is `false`. Setting the property to `true` will result in the image being tagged with an ID that is incremented with every release. This tag will be what is used for running app code.

 ```shell
 dokku registry:set node-js-app push-on-release true
--- 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.26.5/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.7\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.5\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.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.26.5/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.5/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -23,6 +23,6 @@
    "0.23.9",
    "0.24.10",
    "0.25.7",
-    "0.26.5"
+    "0.26.7"
  ]
 }
--- a/docs/configuration/nginx.md
+++ b/docs/configuration/nginx.md
@@ -289,7 +289,7 @@ Unsetting this value is the same as enabling custom nginx config usage.

 Finally, each process type has it's network listeners - a list of IP:PORT pairs for the respective app containers - exposed via an `.DOKKU_APP_${PROCESS_TYPE}_LISTENERS` variable - the `PROCESS_TYPE` will be upper-cased with hyphens transformed into underscores. Users can use the new variables to expose non-web processes via the nginx proxy.

-> Note: Application config variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
+> Note: Application environment variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.

 #### Customizing via configuration files included by the default templates

--- a/docs/deployment/methods/git.md
+++ b/docs/deployment/methods/git.md
@@ -145,7 +145,7 @@ The resulting `git:from-image` call would then be:

 ```shell
 # where the image sha is: sha256:9d187c3025d03c033dcc71e3a284fee53be88cc4c0356a19242758bc80cab673
-dokku git:from-image node-js-app dokku/node-js-getting-started:@sha256:9d187c3025d03c033dcc71e3a284fee53be88cc4c0356a19242758bc80cab673
+dokku git:from-image node-js-app dokku/node-js-getting-started@sha256:9d187c3025d03c033dcc71e3a284fee53be88cc4c0356a19242758bc80cab673
 ```

 The `git:from-image` command can optionally take a git `user.name` and `user.email` argument (in that order) to customize the author. If the arguments are left empty, they will fallback to `Dokku` and `automated@dokku.sh`, respectively.
--- 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.26.5-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.26.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.26.5
+docker pull dokku/dokku:0.26.7
 ```

 Next, run the image.
@@ -18,7 +18,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.26.5
+  dokku/dokku:0.26.7
 ```

 The above command will start a new docker container that is ready when a message similar to `Runit started as PID 12345` appears.
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -19,8 +19,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.26.5/bootstrap.sh;
-sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh;
+sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
--- a/docs/getting-started/upgrading.md
+++ b/docs/getting-started/upgrading.md
@@ -118,6 +118,5 @@ To upgrade Herokuish from source, upgrade with:
 cd /tmp
 git clone https://github.com/gliderlabs/herokuish.git
 cd herokuish
-git pull origin master
-IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest VERSION=master make -e build-in-docker
+CIRCLECI=true IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest make build/docker
 ```
--- 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.26.5/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.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.26.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.26.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.26.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.26.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.26.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.26.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.26.7/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <style>
    </style>
@@ -63,7 +63,7 @@
                <a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a>
              </li>
              <li class="nav-item">
-                <a class="nav-link" href="/{{NAME}}/enterprise/pro/">Pro</a>
+                <a class="nav-link" href="https://pro.dokku.com/">Pro</a>
              </li>
            </ul>
          </div>
@@ -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.26.5/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="output">&nbsp;# Configure your server domain via `dokku domains:set-global`</span>
--- a/docs/processes/scheduled-cron-tasks.md
+++ b/docs/processes/scheduled-cron-tasks.md
@@ -61,12 +61,12 @@ cGhwPT09cGhwIHRlc3QucGhwPT09QGRhaWx5  @daily     node index.js
 cGhwPT09dHJ1ZT09PSogKiAqICogKg==      * * * * *  true
 ```

-#### Displaying reports for an app
+#### Displaying reports

 You can get a report about the cron configuration for apps using the `cron:report` command:

 ```shell
-dokku cron:report node-js-app
+dokku cron:report
 ```

 ```
--- 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.26.5/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.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.26.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.26.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.26.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.26.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.26.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.26.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.26.7/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.7/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.5/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.5/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.7/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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.26.5/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.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>
@@ -76,7 +76,7 @@
                <a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a>
              </li>
              <li class="nav-item">
-                <a class="nav-link" href="/{{NAME}}/enterprise/pro/">Pro</a>
+                <a class="nav-link" href="https://pro.dokku.com/">Pro</a>
              </li>
            </ul>
          </div>
--- 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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- 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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/apps/.gitignore
+++ b/plugins/apps/.gitignore
@@ -5,3 +5,5 @@
 /app-*
 /post-*
 /report
+/install
+/deploy-source-set
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.26.5"
+version = "0.26.7"
 [plugin.config]
--- 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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/builder-herokuish/pre-build-buildpack
+++ b/plugins/builder-herokuish/pre-build-buildpack
@@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
 trigger-builder-herokuish-pre-build-buildpack() {
  declare desc="builder-herokuish pre-build-buildpack plugin trigger"
  declare trigger="pre-build-buildpack"
-  declare APP="$1"
+  declare APP="$1" SOURCECODE_WORK_DIR="$2"
  local IMAGE TMP_WORK_DIR

  local DOCKER_BUILD_LABEL_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.app-name=$APP"
@@ -27,7 +27,13 @@ trigger-builder-herokuish-pre-build-buildpack() {
  config_bundle --merged "$APP" | tar -x -C "$TMP_WORK_DIR/.env.d"

  # create build env for 'old style' buildpacks and dokku plugins
-  config_export app "$APP" --format envfile --merged >"$TMP_WORK_DIR/.env"
+  touch "$TMP_WORK_DIR/.env"
+  if [[ -f "$SOURCECODE_WORK_DIR/.env" ]]; then
+    cp -f "$SOURCECODE_WORK_DIR/.env" "$TMP_WORK_DIR/.env"
+  fi
+  local dotenv_contents="$(sed -Ez '$ s/\n+$//' "$TMP_WORK_DIR/.env")"
+  echo "$dotenv_contents" >"$TMP_WORK_DIR/.env"
+  config_export app "$APP" --format envfile --merged >>"$TMP_WORK_DIR/.env"

  if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/pre-build.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
    dokku_log_warn "Failure injecting BUILD_ENV into build environment"
--- a/plugins/builder-null/plugin.toml
+++ b/plugins/builder-null/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builder-null plugin"
-version = "0.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/builder-pack/builder-build
+++ b/plugins/builder-pack/builder-build
@@ -28,15 +28,11 @@ trigger-builder-pack-builder-build() {

  pushd "$SOURCECODE_WORK_DIR" &>/dev/null

-  local TMP_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
-  trap "rm -rf '$TMP_FILE' >/dev/null" RETURN INT TERM
-
-  config_export app "$APP" --format envfile --merged >"$TMP_FILE"
+  ENV_ARGS=($(config_export app "$APP" --format pack-keys --merged))
+  eval "$(config_export app "$APP" --merged)"

  plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR"
-
-  pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web
-
+  pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web "${ENV_ARGS[@]}"
  docker-image-labeler --label=com.dokku.image-stage=build --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE"

  plugn trigger post-build-pack "$APP" "$SOURCECODE_WORK_DIR"
--- 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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/buildpacks/subcommands.go
+++ b/plugins/buildpacks/subcommands.go
@@ -148,7 +148,19 @@ func CommandSetProperty(appName string, property string, value string) error {

 	common.CommandPropertySet("buildpacks", appName, property, value, DefaultProperties, GlobalProperties)
 	if property == "stack" && oldStack != value {
-		return common.PlugnTrigger("post-stack-set", []string{appName, value}...)
+		if appName != "--global" {
+			return common.PlugnTrigger("post-stack-set", []string{appName, value}...)
+		}
+
+		apps, err := common.DokkuApps()
+		if err != nil {
+			return err
+		}
+		for _, app := range apps {
+			if err := common.PlugnTrigger("post-stack-set", []string{app, value}...); err != nil {
+				return err
+			}
+		}
 	}

 	return nil
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.26.5"
+version = "0.26.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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/config/environment.go
+++ b/plugins/config/environment.go
@@ -26,7 +26,7 @@ const (
 	ExportFormatEnvfile
 	//ExportFormatDockerArgs format: --env KEY=VALUE args for docker
 	ExportFormatDockerArgs
-	//ExportFormatDockerArgsKeys format: --env KEY args for docker
+	//ExportFormatDockerArgsKeys format: --env=KEY args for docker
 	ExportFormatDockerArgsKeys
 	//ExportFormatShell format: env arguments for shell
 	ExportFormatShell
@@ -36,6 +36,8 @@ const (
 	ExportFormatJSON
 	//ExportFormatJSONList format: json output as a list of objects
 	ExportFormatJSONList
+	//ExportFormatPackArgKeys format: --env KEY args for pack
+	ExportFormatPackArgKeys
 )

 //Env is a representation for global or app environment
@@ -183,6 +185,8 @@ func (e *Env) Export(format ExportFormat) string {
 		return e.JSONString()
 	case ExportFormatJSONList:
 		return e.JSONListString()
+	case ExportFormatPackArgKeys:
+		return e.PackArgKeysAsString()
 	default:
 		common.LogFail(fmt.Sprintf("Unknown export format: %v", format))
 		return ""
@@ -244,6 +248,16 @@ func (e *Env) JSONListString() string {
 	return string(data)
 }

+//PackArgKeysAsString gets the contents of this Env in the form -env KEY --env...
+func (e *Env) PackArgKeysAsString() string {
+	keys := e.Keys()
+	entries := make([]string, len(keys))
+	for i, k := range keys {
+		entries[i] = fmt.Sprintf("%s%s", "--env ", k)
+	}
+	return strings.Join(entries, " ")
+}
+
 //ShellString gets the contents of this Env in the form "KEY='value' KEY2='value'"
 // for passing the environment in the shell
 func (e *Env) ShellString() string {
--- a/plugins/config/functions.go
+++ b/plugins/config/functions.go
@@ -13,14 +13,15 @@ func export(appName string, global bool, merged bool, format string) error {
 	suffix := "\n"

 	exportTypes := map[string]ExportFormat{
-		"exports":          ExportFormatExports,
-		"envfile":          ExportFormatEnvfile,
 		"docker-args":      ExportFormatDockerArgs,
 		"docker-args-keys": ExportFormatDockerArgsKeys,
-		"shell":            ExportFormatShell,
-		"pretty":           ExportFormatPretty,
+		"envfile":          ExportFormatEnvfile,
+		"exports":          ExportFormatExports,
 		"json":             ExportFormatJSON,
 		"json-list":        ExportFormatJSONList,
+		"pack-keys":        ExportFormatPackArgKeys,
+		"pretty":           ExportFormatPretty,
+		"shell":            ExportFormatShell,
 	}

 	exportType, ok := exportTypes[format]
--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/config/src/subcommands/subcommands.go
+++ b/plugins/config/src/subcommands/subcommands.go
@@ -49,7 +49,7 @@ func main() {
 		args := flag.NewFlagSet("config:export", flag.ExitOnError)
 		global := args.Bool("global", false, "--global: use the global environment")
 		merged := args.Bool("merged", false, "--merged: merge app environment and global environment")
-		format := args.String("format", "exports", "--format: [ exports | envfile | docker-args | docker-args-keys | shell | pretty | json | json-list ] which format to export as)")
+		format := args.String("format", "exports", "--format: [ docker-args | docker-args-keys | exports | envfile | json | json-list | pack-keys | pretty | shell ] which format to export as)")
 		args.Parse(os.Args[2:])
 		if !*global {
 			appName = args.Arg(0)
--- a/plugins/cron/functions.go
+++ b/plugins/cron/functions.go
@@ -167,7 +167,7 @@ func writeCronEntries() error {
 	command.ShowOutput = false
 	out, err := command.CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("Unable to update schedule file: %v", out)
+		return fmt.Errorf("Unable to update schedule file: %s", string(out))
 	}

 	common.LogInfo1("Updated schedule file")
--- a/plugins/cron/plugin.toml
+++ b/plugins/cron/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core cron plugin"
-version = "0.26.5"
+version = "0.26.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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/network/subcommands.go
+++ b/plugins/network/subcommands.go
@@ -142,8 +142,10 @@ func CommandReport(appName string, format string, infoFlag string) error {

 // CommandSet set or clear a network property for an app
 func CommandSet(appName string, property string, value string) error {
-	if err := common.VerifyAppName(appName); err != nil {
-		return err
+	if appName != "--global" {
+		if err := common.VerifyAppName(appName); err != nil {
+			return err
+		}
 	}

 	if property == "bind-all-interfaces" && value == "" {
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -128,7 +128,11 @@ validate_nginx() {

 restart_nginx() {
  declare desc="restart nginx for given distros"
-  fn-nginx-vhosts-nginx-init-cmd "reload"
+  local PROXY_ENABLED="$(plugn trigger proxy-is-enabled "$APP")"
+  local PROXY_TYPE="$(plugn trigger proxy-type "$APP")"
+  if [[ "$PROXY_ENABLED" == "true" ]] && [[ "$PROXY_TYPE" == "nginx" ]]; then
+    fn-nginx-vhosts-nginx-init-cmd "reload"
+  fi
 }

 nginx_logs() {
--- 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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/ps/ps.go
+++ b/plugins/ps/ps.go
@@ -135,6 +135,8 @@ func Start(appName string) error {

 	if runningState == "mixed" {
 		common.LogWarn("App is running in mixed mode, releasing")
+	} else if runningState == "false" {
+		common.LogWarn("App has been detected as not running, releasing")
 	}

 	if runningState != "true" {
--- a/plugins/registry/plugin.toml
+++ b/plugins/registry/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core registry plugin"
-version = "0.26.5"
+version = "0.26.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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/run/plugin.toml
+++ b/plugins/run/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core run plugin"
-version = "0.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/scheduler-null/plugin.toml
+++ b/plugins/scheduler-null/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-null plugin"
-version = "0.26.5"
+version = "0.26.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.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.26.5"
+version = "0.26.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.26.5"
+version = "0.26.7"
 [plugin.config]
--- a/tests/apps/.websocket.disabled/package.json
+++ b/tests/apps/.websocket.disabled/package.json
@@ -7,7 +7,7 @@
    "express": "4.17.x",
    "connect": "*",
    "handlebars": "~4.7.1",
-    "socket.io": "~4.3.0",
+    "socket.io": "~4.4.0",
    "express3-handlebars": "~0.5.2"
  },
  "engines": {
--- a/tests/apps/php/composer.lock
+++ b/tests/apps/php/composer.lock
@@ -1000,16 +1000,16 @@
    "packages-dev": [
        {
            "name": "heroku/heroku-buildpack-php",
-            "version": "v200",
+            "version": "v205",
            "source": {
                "type": "git",
                "url": "https://github.com/heroku/heroku-buildpack-php.git",
-                "reference": "ffa4d0e714439d6f54f9608a0aa16674e82ed0a1"
+                "reference": "8937f4b1ab1697b12c06369ed3b0eada2525ee94"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/ffa4d0e714439d6f54f9608a0aa16674e82ed0a1",
-                "reference": "ffa4d0e714439d6f54f9608a0aa16674e82ed0a1",
+                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/8937f4b1ab1697b12c06369ed3b0eada2525ee94",
+                "reference": "8937f4b1ab1697b12c06369ed3b0eada2525ee94",
                "shasum": ""
            },
            "bin": [
@@ -1037,7 +1037,7 @@
                "nginx",
                "php"
            ],
-            "time": "2021-10-28T22:02:01+00:00"
+            "time": "2022-01-07T12:51:32+00:00"
        }
    ],
    "aliases": [],
--- a/tests/apps/python/.env
+++ b/tests/apps/python/.env
@@ -0,0 +1 @@
+DOTENV_KEY=some_value
--- a/tests/apps/python/bin/pre_compile
+++ b/tests/apps/python/bin/pre_compile
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo "Build time env var SECRET_KEY=${SECRET_KEY}"
--- a/tests/apps/python/release.py
+++ b/tests/apps/python/release.py
@@ -5,7 +5,10 @@ import os
 def main():
    print("GLOBAL_SECRET: {0}".format(os.getenv('GLOBAL_SECRET')))
    print("SECRET_KEY: {0}".format(os.getenv('SECRET_KEY')))
-
+    with open("/app/.env", "r") as f:
+        for line in f.readlines():
+            if "DOTENV_KEY" in line:
+                print(line)

 if __name__ == '__main__':
    main()
--- a/tests/unit/builder-herokuish.bats
+++ b/tests/unit/builder-herokuish.bats
@@ -0,0 +1,19 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  create_app
+}
+
+teardown() {
+  destroy_app
+}
+
+@test "(builder-herouish:build .env)" {
+  run deploy_app python dokku@dokku.me:$TEST_APP
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains 'DOTENV_KEY=some_value'
+}
--- a/tests/unit/builder-pack.bats
+++ b/tests/unit/builder-pack.bats
@@ -15,6 +15,11 @@ teardown() {
 }

@test "(builder-pack:set)" {
+  run /bin/bash -c "dokku config:set $TEST_APP SECRET_KEY=fjdkslafjdk"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
  run /bin/bash -c "dokku builder:set $TEST_APP selected pack"
  echo "output: $output"
  echo "status: $status"
@@ -31,6 +36,7 @@ teardown() {
  assert_success
  assert_output_contains 'Building with buildpack 1' 0
  assert_output_contains 'Installing requirements with pip'
+  assert_output_contains "Build time env var SECRET_KEY=fjdkslafjdk"

  run /bin/bash -c "dokku builder-pack:set $TEST_APP projecttoml-path nonexistent.toml"
  echo "output: $output"
--- a/tests/unit/buildpacks.bats
+++ b/tests/unit/buildpacks.bats
@@ -184,6 +184,13 @@ teardown() {
  assert_output "https://github.com/heroku/heroku-buildpack-golang.git https://github.com/heroku/heroku-buildpack-python.git https://github.com/heroku/heroku-buildpack-php.git"
 }

+@test "(buildpacks) buildpacks:set-property" {
+  run /bin/bash -c "dokku buildpacks:set-property --global stack gliderlabs/herokuish:latest"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
@test "(buildpacks) buildpacks:remove" {
  run /bin/bash -c "dokku buildpacks:set $TEST_APP heroku/nodejs"
  echo "output: $output"
Author	SHA1	Message	Date
Dokku Bot	3bb8812e33	Release 0.26.7 # History ## 0.26.7 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.26.7/bootstrap.sh sudo DOKKU_TAG=v0.26.7 bash bootstrap.sh ``` ### Bug Fixes - #5003: @josegonzalez Respect pre-existing .env files when preparing the herokuish buildenv - #4950: @emdienn Use exported environment vars during pack build - #4999: @elhu Purge cache for all apps when calling buildpacks:set-property with --global flag - #4988: @fomojola Conditionally restart NGINX - #4922: @josegonzalez Gitignore more built plugin triggers in apps plugin ### New Features - #4964: @josegonzalez Add log message when running state is false - #4970: @josegonzalez Log the string error and not bytes when there is an issue updating the cron schedule - #4924: @josegonzalez Update devcontainer to include aliased go packages - #4920: @josegonzalez Ensure related go source and vscode plugins are installed in devcontainer ### Documentation - #4949: @IlyaSemenov docs: update herokuish upgrade instructions - #4992: @anthonyshew Typo for deploying using image SHA - #4976: @josegonzalez Update link in header to dokku pro - #4972: @Dam-Buty Clarify cron:report command - #4943: @Stormheg Fix typo in registry management documentation - #4935: @josegonzalez Reword note about env vars in nginx config templates ### Other - #4995: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 203 to 205 in /tests/apps/php - #4978: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 201 to 203 in /tests/apps/php - #4936: @dependabot[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 200 to 201 in /tests/apps/php - #4937: @dependabot[bot] chore(deps): bump socket.io from 4.3.2 to 4.4.0 in /tests/apps/.websocket.disabled	2022-01-18 09:35:34 +00:00
Jose Diaz-Gonzalez	230a1dbcc4	Merge pull request #5003 from dokku/4894-dotenv Respect pre-existing .env files when preparing the herokuish buildenv	2022-01-18 04:06:52 -05:00
Jose Diaz-Gonzalez	07f2ef1411	fix: respect pre-existing .env files when preparing the herokuish buildenv Closes #4894	2022-01-18 02:21:12 -05:00
Jose Diaz-Gonzalez	3c68114ad3	Merge pull request #4950 from emdienn/bugfix/env-at-build-time Use exported environment vars during pack build	2022-01-16 18:23:56 -05:00
Jose Diaz-Gonzalez	4f870512f4	fix: correct lint error	2022-01-15 08:44:02 -05:00
Jose Diaz-Gonzalez	5b7464f525	refactor: use new name for pack format	2022-01-15 08:39:53 -05:00
Jose Diaz-Gonzalez	64d6c28e30	Merge pull request #4999 from elhu/4990-set-stack-global-cache Purge cache for all apps when calling buildpacks:set-property with --global flag	2022-01-15 08:37:43 -05:00
Jose Diaz-Gonzalez	6f55b89149	refactor: simplify env var passing by using a new config:export format Also add a test for env vars during build time for pack-built applications.	2022-01-15 08:34:02 -05:00
TheDoctor	7f213beefa	Mirror env behaviour from herokuish builder, adapt to pack Docker accepts its flags as --env=FOO but pack requires --env FOO, which is why ENV_ARGS_VALUES is iterated into ENV_ARGS, then pack run through eval	2022-01-15 06:54:03 -05:00
TheDoctor	bc1aba6c7a	Use exported environment vars during pack build Config was exported, but the result never used.	2022-01-15 06:54:03 -05:00
Jose Diaz-Gonzalez	861dc9fe95	Merge pull request #4949 from IlyaSemenov/fix/herokuish_update docs: update herokuish upgrade instructions	2022-01-15 06:46:44 -05:00
Jose Diaz-Gonzalez	0a7994b67f	Merge pull request #4964 from dokku/josegonzalez-patch-1 Add log message when running state is false	2022-01-15 06:44:06 -05:00
Jose Diaz-Gonzalez	a5441ff03e	Merge pull request #4970 from dokku/4969-log-err Log the string error and not bytes when there is an issue updating the cron schedule	2022-01-15 06:42:18 -05:00
Jose Diaz-Gonzalez	dd7ae8c617	Merge pull request #4995 from dokku/dependabot/composer/tests/apps/php/heroku/heroku-buildpack-php-205 chore(deps-dev): bump heroku/heroku-buildpack-php from 203 to 205 in /tests/apps/php	2022-01-15 06:41:41 -05:00
Vincent Boisard	cf4eed2de0	Add test for buildpacks:set-property --global	2022-01-13 23:21:57 +01:00
Vincent Boisard	d7dfc5d30b	Purge cache for all apps when calling buildpacks:set-property with --global flag	2022-01-13 19:42:11 +01:00
dependabot[bot]	27cda5dd31	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 203 to 205. - [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/v203...v205) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-10 13:11:38 +00:00
Jose Diaz-Gonzalez	cbacdb7e2c	Merge pull request #4992 from anthonyshew/patch-1 Typo for deploying using image SHA	2022-01-07 14:34:16 -05:00
Anthony Shew	0fbb92f3ad	Typo for deploying using image SHA The command for using an image doesn't include a colon before the `@sha`. Just wanted to help out others because this was tripping me up for like an hour!	2022-01-07 12:31:44 -07:00
Jose Diaz-Gonzalez	7e857b3846	Merge pull request #4988 from fomojola/patch-4 Conditionally restart NGINX	2021-12-31 11:43:12 -05:00
Femi Omojola	c75fe998e2	shfmt fixes	2021-12-31 00:48:47 -05:00
fomojola	55d8e2db81	Formatting fixes	2021-12-30 22:56:47 -05:00
fomojola	c209787de8	Conditionally restart NGINX Before restarting nginx, check if the current app is using a proxy and if the selected proxy is in fact NGINX. Only then should we bother invoking the nginx reload. Fixes https://github.com/dokku/dokku/issues/4987	2021-12-30 22:49:57 -05:00
Jose Diaz-Gonzalez	c4ce25415b	Merge pull request #4978 from dokku/dependabot/composer/tests/apps/php/heroku/heroku-buildpack-php-203 chore(deps-dev): bump heroku/heroku-buildpack-php from 201 to 203 in /tests/apps/php	2021-12-26 15:40:16 -05:00
dependabot[bot]	423493ac8d	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 201 to 203. - [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/v201...v203) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-12-20 13:12:26 +00:00
Jose Diaz-Gonzalez	7818c82075	Merge pull request #4976 from dokku/dokku-pro-link Update link in header to dokku pro	2021-12-15 02:33:51 -05:00
Jose Diaz-Gonzalez	84b9988330	Merge pull request #4972 from Dam-Buty/patch-1 Clarify cron:report command	2021-12-15 02:33:35 -05:00
Jose Diaz-Gonzalez	ddf6755d0c	chore: update header link to dokku pro	2021-12-15 02:32:41 -05:00
Jose Diaz-Gonzalez	850a7d55d9	docs: update link in header to dokku pro	2021-12-15 02:31:52 -05:00
Damien BUTY	f6a819351f	Update scheduled-cron-tasks.md	2021-12-10 11:05:34 +01:00
Jose Diaz-Gonzalez	c6f4e4bc14	fix: log the string error and not bytes Refs #4969	2021-12-07 09:27:07 -05:00
Jose Diaz-Gonzalez	e24a3603ac	feat: add log message when running state is false Without this, its not clear why we are releasing an app when calling `ps:start` or `ps:restore`.	2021-12-02 11:53:13 -05:00
Ilya Semenov	1186f3fccf	docs: update herokuish upgrade instructions Closes #4944	2021-11-24 18:40:53 +07:00
Jose Diaz-Gonzalez	e0c2e7846a	Merge pull request #4943 from Stormheg/patch-1 Fix typo in registry management documentation	2021-11-21 12:57:36 -05:00
Storm Heg	416b25d6ae	Fix typo in registry-management.md	2021-11-21 14:54:12 +01:00
Jose Diaz-Gonzalez	9075b7b175	Merge pull request #4936 from dokku/dependabot/composer/tests/apps/php/heroku/heroku-buildpack-php-201 chore(deps-dev): bump heroku/heroku-buildpack-php from 200 to 201 in /tests/apps/php	2021-11-19 10:31:51 -05:00
Jose Diaz-Gonzalez	780cb5a2e7	Merge pull request #4937 from dokku/dependabot/npm_and_yarn/tests/apps/dot-websocket.disabled/socket.io-4.4.0 chore(deps): bump socket.io from 4.3.2 to 4.4.0 in /tests/apps/.websocket.disabled	2021-11-19 10:31:40 -05:00
dependabot[bot]	27521bf5d6	chore(deps): bump socket.io in /tests/apps/.websocket.disabled Bumps [socket.io](https://github.com/socketio/socket.io) from 4.3.2 to 4.4.0. - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/master/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io/compare/4.3.2...4.4.0) --- updated-dependencies: - dependency-name: socket.io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-11-19 13:11:27 +00:00
dependabot[bot]	5d255301b4	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 200 to 201. - [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/v200...v201) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-11-19 13:11:13 +00:00
Jose Diaz-Gonzalez	2d2d4247a1	Merge pull request #4935 from dokku/josegonzalez-patch-1 Reword note about env vars in nginx config templates	2021-11-18 13:42:52 -05:00
Jose Diaz-Gonzalez	496488cb3e	docs: reword note about env vars in nginx config templates Refs #3686	2021-11-18 13:42:38 -05:00
Jose Diaz-Gonzalez	dacbb0f2dc	Merge pull request #4924 from dokku/josegonzalez-patch-1 Update devcontainer to include aliased go packages	2021-11-13 22:08:12 -05:00
Jose Diaz-Gonzalez	36c0f7c160	chore: update devcontainer to include aliased go packages These don't get installed by the go list hack for various reasons. While it would be best to download the _exact_ versions in use, installing the "latest" is better than nothing for local development.	2021-11-13 22:07:00 -05:00
Jose Diaz-Gonzalez	78a984b52f	Merge pull request #4920 from dokku/full-devcontainer-env Ensure related go source and vscode plugins are installed in devcontainer	2021-11-12 17:02:48 -05:00
Jose Diaz-Gonzalez	bc7a3de68d	Merge pull request #4922 from dokku/josegonzalez-patch-1 Gitignore more built plugin triggers in apps plugin	2021-11-12 16:45:13 -05:00
Jose Diaz-Gonzalez	53f963f028	fix: gitignore more built plugin triggers in apps plugin	2021-11-12 16:42:35 -05:00
Jose Diaz-Gonzalez	02b3b8e7e6	feat: ensure related go source and vscode plugins are installed in devcontainer	2021-11-12 16:41:52 -05:00
Dokku Bot	c45b61d402	Release 0.26.6 # History ## 0.26.6 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh ``` ### Bug Fixes - #4919: @nerg4l fix: do not validate global flag as an app name - #4918: @josegonzalez Use netrc binary to properly release dokku client homebrew formula	2021-11-12 15:09:05 +00:00
Jose Diaz-Gonzalez	f1b0be30e0	Merge pull request #4919 from nerg4l/fix-network-global fix: do not validate global flag as an app name	2021-11-12 10:08:26 -05:00
László Görög	1222b9fdb4	fix: do not validate global flag as an app name	2021-11-12 10:37:15 +01:00
Jose Diaz-Gonzalez	bb54231233	Merge pull request #4918 from dokku/formula-release-with-creds Use netrc binary to properly release dokku client homebrew formula	2021-11-11 19:29:58 -05:00
Jose Diaz-Gonzalez	4306178966	fix: use netrc binary to properly release dokku client homebrew formula	2021-11-11 18:59:03 -05:00