From cb16cae09b20ccfbdc430a4cf627e9c956beeedd Mon Sep 17 00:00:00 2001 From: Alessio Date: Mon, 22 Apr 2019 22:08:28 +0100 Subject: [PATCH 01/44] fix nginx template with Connection header to http_connection --- plugins/nginx-vhosts/templates/nginx.conf.sigil | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 360ba4a6a..59e902ba9 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -26,7 +26,7 @@ server { proxy_pass http://{{ $.APP }}-{{ $upstream_port }}; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + proxy_set_header Connection $http_connection; proxy_set_header Host $http_host; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-For $remote_addr; From d356cef183c88eea12bb5f53c6dc9a2d59d29806 Mon Sep 17 00:00:00 2001 From: Marc Diethelm Date: Sat, 27 Apr 2019 14:17:59 +0200 Subject: [PATCH 02/44] Adds an example how to specify a Dockerfile for deployment --- docs/deployment/methods/dockerfiles.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/deployment/methods/dockerfiles.md b/docs/deployment/methods/dockerfiles.md index 4a8458fa9..4433c6cb5 100644 --- a/docs/deployment/methods/dockerfiles.md +++ b/docs/deployment/methods/dockerfiles.md @@ -26,6 +26,7 @@ For security reasons - and as per [Docker recommendations](https://github.com/do For users that require customization in the `build` phase, you may use build arguments via the [docker-options plugin](docs/advanced-usage/docker-options.md): ```shell +dokku docker-options:add node-js-app build '--file Dockerfile.dokku' # e.g. to use alternate Dockerfile dokku docker-options:add node-js-app build '--build-arg NODE_ENV=production' ``` From 9fc26aeb417751d84402aba3eb5bd6119cd3f0da Mon Sep 17 00:00:00 2001 From: Jens Fischer Date: Thu, 2 May 2019 22:09:27 -0400 Subject: [PATCH 03/44] add multi dockerfile plugin to plugins.md --- docs/community/plugins.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/community/plugins.md b/docs/community/plugins.md index 0c63f5896..a5f317f9e 100644 --- a/docs/community/plugins.md +++ b/docs/community/plugins.md @@ -57,6 +57,7 @@ The following plugins are available and provided by Dokku maintainers. Where not [Aluxian]: https://github.com/Aluxian [Aomitayo]: https://github.com/Aomitayo [apmorton]: https://github.com/apmorton +[artofrawr]: https://github.com/artofrawr [basgys]: https://github.com/basgys [Benjamin-Dobell]: https://github.com/Benjamin-Dobell [blag]: https://github.com/blag @@ -229,6 +230,7 @@ The following plugins are available and provided by Dokku maintainers. Where not | [Long Timeout](https://github.com/investtools/dokku-long-timeout-plugin) | [investtools][] | 0.4.0+ | | [Monit](https://github.com/cjblomqvist/dokku-monit) | [cjblomqvist][] | 0.3.x | | [Monorepo](https://github.com/iamale/dokku-monorepo) | [iamale][] | 0.4.0+ | +| [Multi Dockerfile](https://github.com/artofrawr/dokku-multi-dockerfile) | [artofrawr][] | 0.4.0+ | | [Node](https://github.com/ademuk/dokku-nodejs) | [ademuk][] | 0.3.x | | [Node](https://github.com/pnegahdar/dokku-node) | [pnegahdar][] | 0.3.x | | [Rollbar](https://github.com/iloveitaly/dokku-rollbar) | [iloveitaly][] | 0.5.0+ | From 6869fda75be2194b350c94457fe633a7bb89f659 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 6 May 2019 10:51:20 -0400 Subject: [PATCH 04/44] fix: use DOKKU_IMAGE for report command --- dokku | 2 +- plugins/00_dokku-standard/subcommands/report | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dokku b/dokku index 3ec818777..6d90d7d72 100755 --- a/dokku +++ b/dokku @@ -36,7 +36,7 @@ DOKKU_DISTRO=$( echo "$ID" ) -export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"} +export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish:latest"} export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"} export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"} diff --git a/plugins/00_dokku-standard/subcommands/report b/plugins/00_dokku-standard/subcommands/report index a8cad044b..0fb8923ab 100755 --- a/plugins/00_dokku-standard/subcommands/report +++ b/plugins/00_dokku-standard/subcommands/report @@ -17,7 +17,7 @@ dokku_report_cmd() { docker -D info | sed "s/^/ /" dokku_log_info1 "sigil version: $(sigil -v)" dokku_log_info1 "herokuish version: " - docker run --rm gliderlabs/herokuish:latest herokuish version | sed "s/^/ /" + docker run --rm "$DOKKU_IMAGE" herokuish version | sed "s/^/ /" dokku_log_info1 "dokku version: $(dokku version)" dokku_log_info1 "dokku plugins: " dokku plugin:list | sed "s/^/ /" From 0275c65b8a86f52da0d64e392e48d2071ce0f4fd Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 6 May 2019 11:18:56 -0400 Subject: [PATCH 05/44] feat: add support for quiet ps:scale output The previous output required too much parsing to be used in an automated fashion. This change makes that a bit easier, without sacrificing usability. Note that the output is quite a bit different from heroku. This is purposeful as we do not have the concept of dynos. Closes #3520 --- plugins/ps/functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/ps/functions b/plugins/ps/functions index 3b4270dff..2a8f0cde4 100755 --- a/plugins/ps/functions +++ b/plugins/ps/functions @@ -185,13 +185,13 @@ ps_scale() { [[ ! -e $DOKKU_SCALE_FILE ]] && generate_scale_file "$APP" "$IMAGE_TAG" if [[ -z "$@" ]]; then dokku_log_info1_quiet "Scaling for $APP" - dokku_col_log_info1_quiet "proctype" "qty" - dokku_col_log_info1_quiet "--------" "---" + dokku_col_log_msg_quiet "proctype" "qty" + dokku_col_log_msg_quiet "--------" "---" while read -r line || [[ -n "$line" ]]; do [[ -z "$line" ]] && continue local PROC_NAME=${line%%=*} local PROC_COUNT=${line#*=} - dokku_col_log_info1 "$PROC_NAME" "$PROC_COUNT" + dokku_col_log_msg "${PROC_NAME}:" "$PROC_COUNT" done <"$DOKKU_SCALE_FILE" else set_scale "$APP" "$@" From 2f83b29f1a60608a970a63dd1db46c09036b999e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 7 May 2019 12:02:19 -0400 Subject: [PATCH 06/44] Release 0.16.0 # History ## 0.16.0 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh ``` ### Bug Fixes - #3527: @josegonzalez Use DOKKU_IMAGE for report command ### New Features - #3528: @josegonzalez feat: add support for quiet ps:scale output - #3516: @ape-box fix nginx template with Connection header to http_connection - #3513: @Mayeu Support installing plugins via file:// scheme ### Documentation - #3525: @artofrawr add multi dockerfile plugin to plugins.md - #3518: @renestalder Add GitLab GIT_STRATEGY for stop_preview_app - #3506: @vanastassiou Clarify application deployment documentation - #3512: @Mayeu Update example app in deploy tutorial --- HISTORY.md | 26 +++++++++++ README.md | 4 +- contrib/dokku-installer.py | 2 +- debian/control | 2 +- docs/advanced-usage/plugin-management.md | 50 +++++++++++----------- docs/assets/favicons/browserconfig.xml | 8 ++-- docs/assets/favicons/manifest.json | 12 +++--- docs/assets/style.css | 4 +- docs/assets/versions.json | 3 +- docs/development/release-process.md | 2 +- docs/getting-started/installation.md | 4 +- docs/home.html | 40 ++++++++--------- docs/template.html | 36 ++++++++-------- plugins/00_dokku-standard/plugin.toml | 2 +- plugins/20_events/plugin.toml | 2 +- plugins/app-json/plugin.toml | 2 +- plugins/apps/plugin.toml | 2 +- plugins/build-env/plugin.toml | 2 +- plugins/buildpacks/plugin.toml | 2 +- plugins/certs/plugin.toml | 2 +- plugins/checks/plugin.toml | 2 +- plugins/common/plugin.toml | 2 +- plugins/config/plugin.toml | 2 +- plugins/docker-options/plugin.toml | 2 +- plugins/domains/plugin.toml | 2 +- plugins/enter/plugin.toml | 2 +- plugins/git/plugin.toml | 2 +- plugins/logs/plugin.toml | 2 +- plugins/network/plugin.toml | 2 +- plugins/nginx-vhosts/plugin.toml | 2 +- plugins/plugin/plugin.toml | 2 +- plugins/proxy/plugin.toml | 2 +- plugins/ps/plugin.toml | 2 +- plugins/repo/plugin.toml | 2 +- plugins/resource/plugin.toml | 2 +- plugins/scheduler-docker-local/plugin.toml | 2 +- plugins/shell/plugin.toml | 2 +- plugins/ssh-keys/plugin.toml | 2 +- plugins/storage/plugin.toml | 2 +- plugins/tags/plugin.toml | 2 +- plugins/tar/plugin.toml | 2 +- 41 files changed, 138 insertions(+), 111 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index dcf5aa7e4..2f6e973c8 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,31 @@ # History +## 0.16.0 + +Install/update via the bootstrap script: + +```shell +wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh +sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh +``` + +### Bug Fixes + +- #3527: @josegonzalez Use DOKKU_IMAGE for report command + +### New Features + +- #3528: @josegonzalez feat: add support for quiet ps:scale output +- #3516: @ape-box fix nginx template with Connection header to http_connection +- #3513: @Mayeu Support installing plugins via file:// scheme + +### Documentation + +- #3525: @artofrawr add multi dockerfile plugin to plugins.md +- #3518: @renestalder Add GitLab GIT_STRATEGY for stop_preview_app +- #3506: @vanastassiou Clarify application deployment documentation +- #3512: @Mayeu Update example app in deploy tutorial + ## 0.15.5 Install/update via the bootstrap script: diff --git a/README.md b/README.md index c69901ab7..c12c02380 100644 --- a/README.md +++ b/README.md @@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems: 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.15.5/bootstrap.sh -sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh +wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh +sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh ``` You can then proceed to the ip address or domain name associated with your server to complete the web-based installation. diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py index 75715215f..b83ecd8e2 100755 --- a/contrib/dokku-installer.py +++ b/contrib/dokku-installer.py @@ -10,7 +10,7 @@ import subprocess import sys import threading -VERSION = 'v0.15.5' +VERSION = 'v0.16.0' hostname = '' try: diff --git a/debian/control b/debian/control index c330ff244..18c981225 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Package: dokku -Version: 0.15.5 +Version: 0.16.0 Section: web Priority: optional Architecture: amd64 diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md index 1abaec70f..0ae0f5590 100644 --- a/docs/advanced-usage/plugin-management.md +++ b/docs/advanced-usage/plugin-management.md @@ -31,31 +31,31 @@ dokku plugin ``` plugn: dev - 00_dokku-standard 0.15.5 enabled dokku core standard plugin - 20_events 0.15.5 enabled dokku core events logging plugin - apps 0.15.5 enabled dokku core apps plugin - build-env 0.15.5 enabled dokku core build-env plugin - certs 0.15.5 enabled dokku core certificate management plugin - checks 0.15.5 enabled dokku core checks plugin - common 0.15.5 enabled dokku core common plugin - config 0.15.5 enabled dokku core config plugin - docker-options 0.15.5 enabled dokku core docker-options plugin - domains 0.15.5 enabled dokku core domains plugin - enter 0.15.5 enabled dokku core enter plugin - git 0.15.5 enabled dokku core git plugin - logs 0.15.5 enabled dokku core logs plugin - named-containers 0.15.5 enabled dokku core named containers plugin - network 0.15.5 enabled dokku core network plugin - nginx-vhosts 0.15.5 enabled dokku core nginx-vhosts plugin - plugin 0.15.5 enabled dokku core plugin plugin - proxy 0.15.5 enabled dokku core proxy plugin - ps 0.15.5 enabled dokku core ps plugin - repo 0.15.5 enabled dokku core repo plugin - shell 0.15.5 enabled dokku core shell plugin - ssh-keys 0.15.5 enabled dokku core ssh-keys plugin - storage 0.15.5 enabled dokku core storage plugin - tags 0.15.5 enabled dokku core tags plugin - tar 0.15.5 enabled dokku core tar plugin + 00_dokku-standard 0.16.0 enabled dokku core standard plugin + 20_events 0.16.0 enabled dokku core events logging plugin + apps 0.16.0 enabled dokku core apps plugin + build-env 0.16.0 enabled dokku core build-env plugin + certs 0.16.0 enabled dokku core certificate management plugin + checks 0.16.0 enabled dokku core checks plugin + common 0.16.0 enabled dokku core common plugin + config 0.16.0 enabled dokku core config plugin + docker-options 0.16.0 enabled dokku core docker-options plugin + domains 0.16.0 enabled dokku core domains plugin + enter 0.16.0 enabled dokku core enter plugin + git 0.16.0 enabled dokku core git plugin + logs 0.16.0 enabled dokku core logs plugin + named-containers 0.16.0 enabled dokku core named containers plugin + network 0.16.0 enabled dokku core network plugin + nginx-vhosts 0.16.0 enabled dokku core nginx-vhosts plugin + plugin 0.16.0 enabled dokku core plugin plugin + proxy 0.16.0 enabled dokku core proxy plugin + ps 0.16.0 enabled dokku core ps plugin + repo 0.16.0 enabled dokku core repo plugin + shell 0.16.0 enabled dokku core shell plugin + ssh-keys 0.16.0 enabled dokku core ssh-keys plugin + storage 0.16.0 enabled dokku core storage plugin + tags 0.16.0 enabled dokku core tags plugin + tar 0.16.0 enabled dokku core tar plugin ``` Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins. diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml index 22799d291..92080afec 100644 --- a/docs/assets/favicons/browserconfig.xml +++ b/docs/assets/favicons/browserconfig.xml @@ -2,10 +2,10 @@ - - - - + + + + #da532c diff --git a/docs/assets/favicons/manifest.json b/docs/assets/favicons/manifest.json index b7a48167c..76d1ee7e3 100644 --- a/docs/assets/favicons/manifest.json +++ b/docs/assets/favicons/manifest.json @@ -2,37 +2,37 @@ "name": "Dokku", "icons": [ { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-36x36.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-36x36.png", "sizes": "36x36", "type": "image\/png", "density": "0.75" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-48x48.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-48x48.png", "sizes": "48x48", "type": "image\/png", "density": "1.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-72x72.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-72x72.png", "sizes": "72x72", "type": "image\/png", "density": "1.5" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-96x96.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-96x96.png", "sizes": "96x96", "type": "image\/png", "density": "2.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-144x144.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-144x144.png", "sizes": "144x144", "type": "image\/png", "density": "3.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.15.5\/docs\/assets\/favicons\/android-chrome-192x192.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.16.0\/docs\/assets\/favicons\/android-chrome-192x192.png", "sizes": "192x192", "type": "image\/png", "density": "4.0" diff --git a/docs/assets/style.css b/docs/assets/style.css index 8bd0f4f3a..af3e1715a 100644 --- a/docs/assets/style.css +++ b/docs/assets/style.css @@ -39,13 +39,13 @@ h1 { font-size: 1.6em; } .header .navbar-brand a { - background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/dokku.png); + background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/dokku.png); text-indent: 40px; } .blurb { color: #424242; background-color: #ededed; - background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.15.5/docs/assets/gplaypattern.png); + background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.16.0/docs/assets/gplaypattern.png); padding: 45px 0; text-align: center; } diff --git a/docs/assets/versions.json b/docs/assets/versions.json index 1acd76023..f4e8f2608 100644 --- a/docs/assets/versions.json +++ b/docs/assets/versions.json @@ -12,6 +12,7 @@ "0.12.13", "0.13.4", "0.14.6", - "0.15.5" + "0.15.5", + "0.16.0" ] } diff --git a/docs/development/release-process.md b/docs/development/release-process.md index b462d8df8..6296987e3 100644 --- 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.15.5-2 (Mon Feb 22 23:20:37 CET 2016)" +# wait for "==> build-arch: ==> Finished making: dokku 0.16.0-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' diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md index d8fafa13e..5197bf0fa 100644 --- 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.15.5/bootstrap.sh; -sudo DOKKU_TAG=v0.15.5 bash bootstrap.sh +wget https://raw.githubusercontent.com/dokku/dokku/v0.16.0/bootstrap.sh; +sudo DOKKU_TAG=v0.16.0 bash bootstrap.sh ``` The installation process takes about 5-10 minutes, depending upon internet connection speed. diff --git a/docs/home.html b/docs/home.html index c9b240b50..b72e7c738 100644 --- a/docs/home.html +++ b/docs/home.html @@ -10,30 +10,30 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - +