From cae5030804ead2263daa02a055ee437a5d375da2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 26 Mar 2016 17:03:14 -0400 Subject: [PATCH] Release 0.5.0 - Drop tutum-agent, lxc-docker, docker.io apt package support - Release a new herokuish version - Fix release docs - Upgrade sigil --- HISTORY.md | 72 ++++++++++++++++++++ Makefile | 2 +- README.md | 4 +- contrib/dokku-installer.py | 2 +- deb.mk | 6 +- debian/control | 4 +- docs/assets/favicons/browserconfig.xml | 8 +-- docs/assets/favicons/manifest.json | 12 ++-- docs/assets/style.css | 4 +- docs/assets/versions.json | 3 +- docs/checks-examples.md | 2 +- docs/deployment/deployment-tasks.md | 2 +- docs/deployment/dockerfiles.md | 2 +- docs/development/release-process.md | 5 +- docs/dokku-storage.md | 2 +- docs/home.html | 83 +++++++---------------- docs/index.md | 4 +- docs/installation.md | 4 +- docs/nginx.md | 2 +- docs/proxy.md | 2 +- docs/template.html | 92 +++++--------------------- 21 files changed, 148 insertions(+), 169 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 804e95a9a..3042613a3 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,77 @@ # History +## 0.5.0 + +This is our largest, most feature-packed release in the history of the dokku project. Lots of delicious things, including: + +- Support for docker 1.10/1.11. You *must* have docker 1.9.1+ to install dokku. +- Revamped documentation website +- [Deployment Tasks](http://dokku.viewdocs.io/dokku/deployment/deployment-tasks/) +- Heroku-style management of [dockerfile processes](http://dokku.viewdocs.io/dokku/deployment/dockerfiles/#procfiles-and-multiple-processes) +- Official [persistent storage plugin](http://dokku.viewdocs.io/dokku/dokku-storage/) + +We'd also love it if you welcomed a few new core developers: + +- @MorrisJobke: Maintainer of our new arch linux support +- @u2mejc: Contributed the help refactor and persistent storage plugins + +Thanks to all the contributors who helped with this release! + +## Refactor + +- #1892: @michaelshobbs Refactor nginx proxy plugin to add usage flexibility +- #1925: @josegonzalez Simplify bootstrap.sh installation method +- #1953: @michaelshobbs Refactor commands into subcommands and add support for --app argument +- #1983: @u2mejc Collapse help into expandable command topics +- #1936: @michaelshobbs Cleanup shellcheck SC2086 + +### Bug Fixes + +- #1934: @michaelshobbs Fix get_running_image_tag() with docker 1.10.x +- #1935: @michaelshobbs Remove unnecessary nginx test +- #1941: @cu12 Fix issue with plugins having plugins command +- #1980: @cu12 Fix issue when Dockerfile present but BUILDPACK_URL is set +- #1991: @MorrisJobke Only chown of existing files +- #1993: @istarkov Fix bash incorrect test command +- #2006: @baob Fix too many redirects +- #2012: @michaelshobbs minor bug fixes around app.json and docker-options + +### New Features + +- #1830: @u2mejc Add core storage plugin to manage docker bind mounts +- #1836: @michaelshobbs Support scripts.dokku. in app.json +- #1918: @MorrisJobke Adds support for ArchLinux as host OS +- #1924: @pmclanahan Use Procfile for process types in Dockerfile apps +- #1939: @pmclanahan Add dokku git remote when specifying app name in bash client +- #1958: @u2mejc Enable debug output for dokku global exports in trace +- #1959: @josegonzalez Allow customizing ssh port for the default client +- #1981: @josegonzalez Only remove containers with dokku label +- #1987: @josegonzalez Do not restart stopped processes on config:set/unset + +### Documentation + +- #1687: @u2mejc Deprecate and remove dokku backup plugin, replace with documentation. +- #1931: @josegonzalez Standardize on "relative" doc links +- #1938: @npazo Add information about Slack channel +- #1947: @basgys Add etcd to the list of plugins +- #1951: @znz Fix typos +- #1960: @josegonzalez Clarify which commands should be run where. Closes #1890 +- #1963: @josegonzalez Add floating sidebar on documentation linking to released versions +- #1965: @trevorturk Clarify checks documentation +- #1974: @simenbrekken Update link in Azure installation instructions. Fixes #1973 +- #1979: @josegonzalez Add specific documentation around user management. Closes #1978 +- #1985: @MikeSchroll Make history readable in github +- #1990: @ligthyear Highlight features that are yet to come +- #1992: @Sureiya Improved documentation for using official dokku_client.sh +- #2000: @iamale Add dokku-monorepo to the plugin list in docs +- #2002: @michaelshobbs clarify deployment tasks are supported in both buildpack and dockerfile apps +- #2003: @michaelshobbs Add more useful post-deploy task and make blockquote +- #2004: @josegonzalez Document 0.5.x container removal strategy. Closes #1982 +- #2007: @josegonzalez Document when configuration variables are available. Closes #1860 +- #2009: @samholmes1337 Clarify purpose and potential penalties of primary vhost +- #2011: @josegonzalez Updated installation docs +- #2013: @michaelshobbs Make help desc local consistent + ## 0.4.14 Hah you got us. We have to ship another 0.4.x release to fix issues with diff --git a/Makefile b/Makefile index 771555412..a3713345c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ DOKKU_VERSION = master SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/master/sshcommand PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz -SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.3.3/sigil_0.3.3_Linux_x86_64.tgz +SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz STACK_URL ?= https://github.com/gliderlabs/herokuish.git PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest DOKKU_LIB_ROOT ?= /var/lib/dokku diff --git a/README.md b/README.md index b6d56242a..a7c77bf76 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S To install the latest stable release, you can run the following commands as a user that has access to `sudo`: - wget https://raw.githubusercontent.com/dokku/dokku/v0.4.14/bootstrap.sh - sudo DOKKU_TAG=v0.4.14 bash bootstrap.sh + wget https://raw.githubusercontent.com/dokku/dokku/v0.5.0/bootstrap.sh + sudo DOKKU_TAG=v0.5.0 bash bootstrap.sh ### Upgrading diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py index e952f636c..8c38ad77b 100755 --- a/contrib/dokku-installer.py +++ b/contrib/dokku-installer.py @@ -9,7 +9,7 @@ import subprocess import sys import threading -VERSION = 'v0.4.14' +VERSION = 'v0.5.0' hostname = '' try: diff --git a/deb.mk b/deb.mk index 2ccf58ffd..5b6b2d925 100644 --- a/deb.mk +++ b/deb.mk @@ -1,6 +1,6 @@ HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku' HEROKUISH_REPO_NAME ?= gliderlabs/herokuish -HEROKUISH_VERSION ?= 0.3.8 +HEROKUISH_VERSION ?= 0.3.9 HEROKUISH_ARCHITECTURE = amd64 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb @@ -22,7 +22,7 @@ SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITEC SIGIL_DESCRIPTION = 'Standalone string interpolator and template processor' SIGIL_REPO_NAME ?= gliderlabs/sigil -SIGIL_VERSION ?= 0.3.3 +SIGIL_VERSION ?= 0.4.0 SIGIL_ARCHITECTURE = amd64 SIGIL_PACKAGE_NAME = sigil_$(SIGIL_VERSION)_$(SIGIL_ARCHITECTURE).deb @@ -93,7 +93,7 @@ deb-herokuish: deb-setup cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish @echo "-> Creating $(HEROKUISH_PACKAGE_NAME)" - sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs | docker-engine | lxc-docker (>= 1.6.1) | docker.io (>= 1.6.1) | tutum-agent' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' . + sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1)' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' . mv *.deb /tmp deb-dokku: deb-setup diff --git a/debian/control b/debian/control index b511f4ea3..ccc171ba1 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Package: dokku -Version: 0.4.14 +Version: 0.5.0 Section: web Priority: optional Architecture: amd64 -Depends: locales, git, make, curl, gcc, man-db, sshcommand, docker-engine-cs | docker-engine | lxc-docker (>= 1.6.1) | docker.io (>= 1.6.1) | tutum-agent, software-properties-common, python-software-properties +Depends: locales, git, make, curl, gcc, man-db, sshcommand, docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1), software-properties-common, python-software-properties Recommends: herokuish Pre-Depends: nginx (>= 1.4.6), dnsutils, apparmor, cgroupfs-mount | cgroup-lite, plugn, sudo, python2.7, debconf Maintainer: Jose Diaz-Gonzalez diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml index 6dccbad83..90da120e8 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 987fbf26c..cc7901f6f 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.4.14\/docs\/assets\/favicons\/android-chrome-36x36.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.0\/docs\/assets\/favicons\/android-chrome-36x36.png", "sizes": "36x36", "type": "image\/png", "density": "0.75" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.14\/docs\/assets\/favicons\/android-chrome-48x48.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.0\/docs\/assets\/favicons\/android-chrome-48x48.png", "sizes": "48x48", "type": "image\/png", "density": "1.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.14\/docs\/assets\/favicons\/android-chrome-72x72.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.0\/docs\/assets\/favicons\/android-chrome-72x72.png", "sizes": "72x72", "type": "image\/png", "density": "1.5" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.14\/docs\/assets\/favicons\/android-chrome-96x96.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.0\/docs\/assets\/favicons\/android-chrome-96x96.png", "sizes": "96x96", "type": "image\/png", "density": "2.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.14\/docs\/assets\/favicons\/android-chrome-144x144.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.0\/docs\/assets\/favicons\/android-chrome-144x144.png", "sizes": "144x144", "type": "image\/png", "density": "3.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.14\/docs\/assets\/favicons\/android-chrome-192x192.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.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 2bc08225f..b86d39834 100644 --- a/docs/assets/style.css +++ b/docs/assets/style.css @@ -36,13 +36,13 @@ h1 { background-repeat: no-repeat; } .header .navbar-brand a { - background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.14/docs/assets/dokku.png); + background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.5.0/docs/assets/dokku.png); text-indent: 40px; } .blurb { color: #424242; background-color: #ededed; - background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.14/docs/assets/gplaypattern.png); + background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.5.0/docs/assets/gplaypattern.png); padding: 45px 0; text-align: center; } diff --git a/docs/assets/versions.json b/docs/assets/versions.json index 4964ec5d8..eec8257ea 100644 --- a/docs/assets/versions.json +++ b/docs/assets/versions.json @@ -1,6 +1,7 @@ { "max-versions": [ "0.3.26", - "0.4.14" + "0.4.14", + "0.5.0" ] } diff --git a/docs/checks-examples.md b/docs/checks-examples.md index 196b9fab6..4dc169c83 100644 --- a/docs/checks-examples.md +++ b/docs/checks-examples.md @@ -1,6 +1,6 @@ # Zero Downtime Deploys -> Plugin management is not yet released and only available in master +> New as of 0.5.0 ``` checks Show zero-downtime status diff --git a/docs/deployment/deployment-tasks.md b/docs/deployment/deployment-tasks.md index 1f6116002..edc3188d3 100644 --- a/docs/deployment/deployment-tasks.md +++ b/docs/deployment/deployment-tasks.md @@ -1,6 +1,6 @@ # Deployment Tasks -> Not yet released and only available in master +> New as of 0.5.0 Sometimes you need to run a command on at deployment time, but before an app is completely deployed. Common use cases include: diff --git a/docs/deployment/dockerfiles.md b/docs/deployment/dockerfiles.md index 03bc00b50..ab990c1bc 100644 --- a/docs/deployment/dockerfiles.md +++ b/docs/deployment/dockerfiles.md @@ -42,7 +42,7 @@ Setting `$DOKKU_DOCKERFILE_CACHE_BUILD` to `true` or `false` will enable or disa ### Procfiles and Multiple Processes -> Not yet released and only available in master +> New as of 0.5.0 You can also customize the run command using a `Procfile`, much like you would on Heroku or with a buildpack deployed app. The `Procfile` should contain one or more lines defining [process diff --git a/docs/development/release-process.md b/docs/development/release-process.md index 78f8d6c17..f4882bf77 100644 --- a/docs/development/release-process.md +++ b/docs/development/release-process.md @@ -18,8 +18,7 @@ To propose a release, the following tasks need to be performed: - The versioned links should be updated in the `docs/assets/style.css` file. - The versioned links should be updated in the `docs/home.html` file. - The versioned links should be updated in the `docs/template.html` file. -- The versioned links should be updated in the `docs/template.html` file. -- The versioned links should be updated or added to the `docs/assets/versions.raw` file. +- The versioned links should be updated or added to the `docs/assets/versions.json` file. - A list of changes must be made in the `HISTORY.md`. - A tag must be created locally with your release version - Debian packages *must* be created via `vagrant up build` @@ -68,7 +67,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.4.14-2 (Mon Feb 22 23:20:37 CET 2016)" +# wait for "==> build-arch: ==> Finished making: dokku 0.5.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/dokku-storage.md b/docs/dokku-storage.md index 6fd043d1e..ee7412efc 100644 --- a/docs/dokku-storage.md +++ b/docs/dokku-storage.md @@ -1,6 +1,6 @@ # Dokku Core Storage Plugin -> Not yet released and only available in master +> New as of 0.5.0 The preferred method to mount external containers to a dokku managed container, is to use the dokku storage plugin. diff --git a/docs/home.html b/docs/home.html index d2a9af462..d5a210ff6 100644 --- a/docs/home.html +++ b/docs/home.html @@ -10,69 +10,32 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + - @@ -129,12 +92,12 @@

$ - wget https://raw.githubusercontent.com/dokku/dokku/v0.4.14/bootstrap.sh + wget https://raw.githubusercontent.com/dokku/dokku/v0.5.0/bootstrap.sh

$ - sudo DOKKU_TAG=v0.4.14 bash bootstrap.sh + sudo DOKKU_TAG=v0.5.0 bash bootstrap.sh

 # go to your server's IP and follow the web installer @@ -209,7 +172,7 @@ - +

@@ -245,7 +208,7 @@ Extend Logo
- +
diff --git a/docs/index.md b/docs/index.md index 9376592a3..debe71277 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,12 +15,12 @@

~ $ - wget https://raw.githubusercontent.com/dokku/dokku/v0.4.14/bootstrap.sh + wget https://raw.githubusercontent.com/dokku/dokku/v0.5.0/bootstrap.sh

~ $ - sudo DOKKU_TAG=v0.4.14 bash bootstrap.sh + sudo DOKKU_TAG=v0.5.0 bash bootstrap.sh

# => Go to your server's IP and follow the web installer diff --git a/docs/installation.md b/docs/installation.md index 9cf2e72da..9568bc44d 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -19,8 +19,8 @@ To install the latest stable version of dokku, you can run the following shell c ```shell # installs dokku via apt-get -wget https://raw.githubusercontent.com/dokku/dokku/v0.4.14/bootstrap.sh -sudo DOKKU_TAG=v0.4.14 bash bootstrap.sh +wget https://raw.githubusercontent.com/dokku/dokku/v0.5.0/bootstrap.sh +sudo DOKKU_TAG=v0.5.0 bash bootstrap.sh ``` The installation process takes about 5-10 minutes, depending upon internet connection speed. diff --git a/docs/nginx.md b/docs/nginx.md index 333277058..77a3924ab 100644 --- a/docs/nginx.md +++ b/docs/nginx.md @@ -10,7 +10,7 @@ nginx:error-logs [-t] ## Customizing the nginx configuration -> Not yet released and only available in master +> New as of 0.5.0 Dokku uses a templating library by the name of [sigil](https://github.com/gliderlabs/sigil) to generate nginx configuration for each app. If you'd like to provide a custom template for your application, there are a couple options: diff --git a/docs/proxy.md b/docs/proxy.md index fc58cc4ae..ae3763734 100644 --- a/docs/proxy.md +++ b/docs/proxy.md @@ -1,6 +1,6 @@ # Proxy plugin -> Not yet released and only available in master +> New as of 0.5.0 As of dokku 0.5.0, the proxy functionality has been decoupled from the nginx-vhosts plugin into the proxy plugin. In the future this will allow other proxy software (HAproxy for example) to be used instead of nginx. diff --git a/docs/template.html b/docs/template.html index d88a37423..5cfff5af9 100644 --- a/docs/template.html +++ b/docs/template.html @@ -10,26 +10,26 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - +