From 51547b76882bd995c09cd697392def3d26521331 Mon Sep 17 00:00:00 2001 From: Isao Sugimoto Date: Sun, 31 Jul 2022 15:38:53 +0000 Subject: [PATCH 1/4] fix duplicate syntax for nginx.conf --- 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 8673ac0a7..21a0d01ff 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -62,8 +62,8 @@ server { root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } -{{ end }} include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; +{{ end }} } {{ else if eq $scheme "https"}} server { From 63f7f39048339ead7a8c43712215ef342a6c78fe Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Mon, 1 Aug 2022 15:09:46 +0000 Subject: [PATCH 2/4] Release 0.27.10 # History ## 0.27.10 Install/update via the bootstrap script: ```shell wget https://raw.githubusercontent.com/dokku/dokku/v0.27.10/bootstrap.sh sudo DOKKU_TAG=v0.27.10 bash bootstrap.sh ``` ### Bug Fixes - #5276: @d6rkaiz Remove duplicate syntax for nginx.conf ### Other - #5274: @kennell readme: mention Ubuntu 22.04 compability --- HISTORY.md | 17 +++++++ README.md | 4 +- debian/control | 2 +- docs/advanced-usage/plugin-management.md | 58 +++++++++++----------- docs/assets/favicons/browserconfig.xml | 8 +-- docs/assets/favicons/manifest.json | 12 ++--- docs/assets/versions.json | 2 +- docs/development/release-process.md | 2 +- docs/getting-started/install/docker.md | 4 +- docs/getting-started/installation.md | 4 +- docs/home.html | 38 +++++++------- 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/builder-dockerfile/plugin.toml | 2 +- plugins/builder-herokuish/plugin.toml | 2 +- plugins/builder-null/plugin.toml | 2 +- plugins/builder-pack/plugin.toml | 2 +- plugins/builder/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/cron/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/registry/plugin.toml | 2 +- plugins/repo/plugin.toml | 2 +- plugins/resource/plugin.toml | 2 +- plugins/run/plugin.toml | 2 +- plugins/scheduler-docker-local/plugin.toml | 2 +- plugins/scheduler-null/plugin.toml | 2 +- plugins/scheduler/plugin.toml | 2 +- plugins/shell/plugin.toml | 2 +- plugins/ssh-keys/plugin.toml | 2 +- plugins/storage/plugin.toml | 2 +- plugins/trace/plugin.toml | 2 +- 48 files changed, 138 insertions(+), 121 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 41fc7a72b..10282e0b4 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,22 @@ # History +## 0.27.10 + +Install/update via the bootstrap script: + +```shell +wget https://raw.githubusercontent.com/dokku/dokku/v0.27.10/bootstrap.sh +sudo DOKKU_TAG=v0.27.10 bash bootstrap.sh +``` + +### Bug Fixes + +- #5276: @d6rkaiz Remove duplicate syntax for nginx.conf + +### Other + +- #5274: @kennell readme: mention Ubuntu 22.04 compability + ## 0.27.9 Install/update via the bootstrap script: diff --git a/README.md b/README.md index 881a30db0..5ed324c03 100644 --- a/README.md +++ b/README.md @@ -87,8 +87,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.27.9/bootstrap.sh -sudo DOKKU_TAG=v0.27.9 bash bootstrap.sh +wget https://raw.githubusercontent.com/dokku/dokku/v0.27.10/bootstrap.sh +sudo DOKKU_TAG=v0.27.10 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. diff --git a/debian/control b/debian/control index d08e0be56..b872c85c5 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Package: dokku -Version: 0.27.9 +Version: 0.27.10 Section: web Priority: optional Architecture: amd64 diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md index 795a84f93..07a09f450 100644 --- 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.27.9 enabled dokku core standard plugin - 20_events 0.27.9 enabled dokku core events logging plugin - app-json 0.27.9 enabled dokku core app-json plugin - apps 0.27.9 enabled dokku core apps plugin - build-env 0.27.9 enabled dokku core build-env plugin - buildpacks 0.27.9 enabled dokku core buildpacks plugin - certs 0.27.9 enabled dokku core certificate management plugin - checks 0.27.9 enabled dokku core checks plugin - common 0.27.9 enabled dokku core common plugin - config 0.27.9 enabled dokku core config plugin - docker-options 0.27.9 enabled dokku core docker-options plugin - domains 0.27.9 enabled dokku core domains plugin - enter 0.27.9 enabled dokku core enter plugin - git 0.27.9 enabled dokku core git plugin - logs 0.27.9 enabled dokku core logs plugin - network 0.27.9 enabled dokku core network plugin - nginx-vhosts 0.27.9 enabled dokku core nginx-vhosts plugin - plugin 0.27.9 enabled dokku core plugin plugin - proxy 0.27.9 enabled dokku core proxy plugin - ps 0.27.9 enabled dokku core ps plugin - repo 0.27.9 enabled dokku core repo plugin - resource 0.27.9 enabled dokku core resource plugin - scheduler-docker-local 0.27.9 enabled dokku core scheduler-docker-local plugin - shell 0.27.9 enabled dokku core shell plugin - ssh-keys 0.27.9 enabled dokku core ssh-keys plugin - storage 0.27.9 enabled dokku core storage plugin - tags 0.27.9 enabled dokku core tags plugin - tar 0.27.9 enabled dokku core tar plugin - trace 0.27.9 enabled dokku core trace plugin + 00_dokku-standard 0.27.10 enabled dokku core standard plugin + 20_events 0.27.10 enabled dokku core events logging plugin + app-json 0.27.10 enabled dokku core app-json plugin + apps 0.27.10 enabled dokku core apps plugin + build-env 0.27.10 enabled dokku core build-env plugin + buildpacks 0.27.10 enabled dokku core buildpacks plugin + certs 0.27.10 enabled dokku core certificate management plugin + checks 0.27.10 enabled dokku core checks plugin + common 0.27.10 enabled dokku core common plugin + config 0.27.10 enabled dokku core config plugin + docker-options 0.27.10 enabled dokku core docker-options plugin + domains 0.27.10 enabled dokku core domains plugin + enter 0.27.10 enabled dokku core enter plugin + git 0.27.10 enabled dokku core git plugin + logs 0.27.10 enabled dokku core logs plugin + network 0.27.10 enabled dokku core network plugin + nginx-vhosts 0.27.10 enabled dokku core nginx-vhosts plugin + plugin 0.27.10 enabled dokku core plugin plugin + proxy 0.27.10 enabled dokku core proxy plugin + ps 0.27.10 enabled dokku core ps plugin + repo 0.27.10 enabled dokku core repo plugin + resource 0.27.10 enabled dokku core resource plugin + scheduler-docker-local 0.27.10 enabled dokku core scheduler-docker-local plugin + shell 0.27.10 enabled dokku core shell plugin + ssh-keys 0.27.10 enabled dokku core ssh-keys plugin + storage 0.27.10 enabled dokku core storage plugin + tags 0.27.10 enabled dokku core tags plugin + tar 0.27.10 enabled dokku core tar plugin + trace 0.27.10 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. diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml index 765ef7751..4d1aae471 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 e96763c41..6af931548 100644 --- 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.27.9\/docs\/assets\/favicons\/android-chrome-36x36.png", + "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.10\/docs\/assets\/favicons\/android-chrome-36x36.png", "sizes": "36x36", "type": "image\/png", "density": "0.75" }, { - "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.9\/docs\/assets\/favicons\/android-chrome-48x48.png", + "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.10\/docs\/assets\/favicons\/android-chrome-48x48.png", "sizes": "48x48", "type": "image\/png", "density": "1.0" }, { - "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.9\/docs\/assets\/favicons\/android-chrome-72x72.png", + "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.10\/docs\/assets\/favicons\/android-chrome-72x72.png", "sizes": "72x72", "type": "image\/png", "density": "1.5" }, { - "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.9\/docs\/assets\/favicons\/android-chrome-96x96.png", + "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.10\/docs\/assets\/favicons\/android-chrome-96x96.png", "sizes": "96x96", "type": "image\/png", "density": "2.0" }, { - "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.9\/docs\/assets\/favicons\/android-chrome-144x144.png", + "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.10\/docs\/assets\/favicons\/android-chrome-144x144.png", "sizes": "144x144", "type": "image\/png", "density": "3.0" }, { - "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.9\/docs\/assets\/favicons\/android-chrome-192x192.png", + "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.27.10\/docs\/assets\/favicons\/android-chrome-192x192.png", "sizes": "192x192", "type": "image\/png", "density": "4.0" diff --git a/docs/assets/versions.json b/docs/assets/versions.json index fcdeaff1c..0e4c2f3be 100644 --- a/docs/assets/versions.json +++ b/docs/assets/versions.json @@ -24,6 +24,6 @@ "0.24.10", "0.25.7", "0.26.8", - "0.27.9" + "0.27.10" ] } diff --git a/docs/development/release-process.md b/docs/development/release-process.md index 7bc87460e..0e3825fea 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.27.9-2 (Mon Feb 22 23:20:37 CET 2016)" +# wait for "==> build-arch: ==> Finished making: dokku 0.27.10-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/install/docker.md b/docs/getting-started/install/docker.md index e8fa4b3a8..2b3cdcfd4 100644 --- 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.27.9 +docker pull dokku/dokku:0.27.10 ``` 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.27.9 + dokku/dokku:0.27.10 ``` The above command will start a new docker container that is ready when a message similar to `Runit started as PID 12345` appears. diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md index bf5ded384..c46c03cb0 100644 --- a/docs/getting-started/installation.md +++ b/docs/getting-started/installation.md @@ -39,8 +39,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.27.9/bootstrap.sh; -sudo DOKKU_TAG=v0.27.9 bash bootstrap.sh +wget https://raw.githubusercontent.com/dokku/dokku/v0.27.10/bootstrap.sh; +sudo DOKKU_TAG=v0.27.10 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 fb8ce65bd..dfa227a61 100644 --- a/docs/home.html +++ b/docs/home.html @@ -10,26 +10,26 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + @@ -38,7 +38,7 @@ - + @@ -124,7 +124,7 @@

$ - sudo DOKKU_TAG=v0.27.9 bash bootstrap.sh + sudo DOKKU_TAG=v0.27.10 bash bootstrap.sh


diff --git a/docs/template.html b/docs/template.html index 4f80ac4b3..b07b4de40 100644 --- a/docs/template.html +++ b/docs/template.html @@ -9,26 +9,26 @@ Dokku - {{DOC_TITLE}} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - \ No newline at end of file + From 3f05666d597703ab6602ebd35d6de088c2847cd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 13:10:58 +0000 Subject: [PATCH 4/4] 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 222 to 223. - [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/v222...v223) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- tests/apps/php/composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/apps/php/composer.lock b/tests/apps/php/composer.lock index c1df2ba01..37c93a479 100644 --- a/tests/apps/php/composer.lock +++ b/tests/apps/php/composer.lock @@ -1001,16 +1001,16 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v222", + "version": "v223", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "202c2a14e40f8db277ae963c41aeb26e46f18d94" + "reference": "3cd7de1583bf19b522a912bc7720c537ad4df1bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/202c2a14e40f8db277ae963c41aeb26e46f18d94", - "reference": "202c2a14e40f8db277ae963c41aeb26e46f18d94", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/3cd7de1583bf19b522a912bc7720c537ad4df1bd", + "reference": "3cd7de1583bf19b522a912bc7720c537ad4df1bd", "shasum": "" }, "bin": [ @@ -1038,7 +1038,7 @@ "nginx", "php" ], - "time": "2022-07-07T18:16:23+00:00" + "time": "2022-08-04T22:06:04+00:00" } ], "aliases": [],