diff --git a/HISTORY.md b/HISTORY.md index 9aa30d907..d690b4693 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,11 @@ # History +## 0.12.2 + +### Bug Fixes + +- #3155: @josegonzalez fix: re-add is_container_running + ## 0.12.1 ### Bug Fixes diff --git a/README.md b/README.md index dfe859d6f..7ae85179b 100644 --- a/README.md +++ b/README.md @@ -99,8 +99,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.12.1/bootstrap.sh -sudo DOKKU_TAG=v0.12.1 bash bootstrap.sh +wget https://raw.githubusercontent.com/dokku/dokku/v0.12.2/bootstrap.sh +sudo DOKKU_TAG=v0.12.2 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 32802e33c..2f10dae5a 100755 --- a/contrib/dokku-installer.py +++ b/contrib/dokku-installer.py @@ -10,7 +10,7 @@ import subprocess import sys import threading -VERSION = 'v0.12.1' +VERSION = 'v0.12.2' hostname = '' try: diff --git a/contrib/release b/contrib/release index dc06aeddc..2251be18e 100755 --- a/contrib/release +++ b/contrib/release @@ -237,7 +237,7 @@ fn-repo-update-history-and-commit() { declare desc="Updates the history file and commits the changes" declare CURRENT_VERSION="$1" NEXT_VERSION="$2" local PULL_REQUEST_ID TITLE AUTHOR TYPE CHANGELOG_TEXT - local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG ISSUE_FILE + local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG HISTORY_OTHER ISSUE_FILE pushd "$ROOT_DIR" >/dev/null @@ -258,8 +258,10 @@ fn-repo-update-history-and-commit() { HISTORY_BUG="${HISTORY_BUG}"$'\n'"$CHANGELOG_TEXT" elif [[ "$TYPE" == "documentation" ]]; then HISTORY_DOCUMENTATION="${HISTORY_DOCUMENTATION}"$'\n'"$CHANGELOG_TEXT" - elif [[ "$TYPE" == "enhancement" ]]; then + elif [[ "$TYPE" == "enhancement" ]] || [[ "$TYPE" == "refactor" ]]; then HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT" + else + HISTORY_OTHER="${HISTORY_OTHER}"$'\n'"$CHANGELOG_TEXT" fi done @@ -281,6 +283,11 @@ fn-repo-update-history-and-commit() { HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION" fi + if [[ "$HISTORY_OTHER" ]]; then + HISTORY="${HISTORY}"$'\n\n'"### Other" + HISTORY="${HISTORY}"$'\n'"$HISTORY_OTHER" + fi + sed -i.bak '1d' HISTORY.md && rm HISTORY.md.bak HISTORY_CONTENTS="$(cat HISTORY.md)" echo -e "$HISTORY\n$HISTORY_CONTENTS" >HISTORY.md diff --git a/debian/control b/debian/control index bbe02801d..1f1679b44 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Package: dokku -Version: 0.12.1 +Version: 0.12.2 Section: web Priority: optional Architecture: amd64 diff --git a/docs/advanced-usage/plugin-management.md b/docs/advanced-usage/plugin-management.md index 5b5c784b8..f919df5a1 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.12.1 enabled dokku core standard plugin - 20_events 0.12.1 enabled dokku core events logging plugin - apps 0.12.1 enabled dokku core apps plugin - build-env 0.12.1 enabled dokku core build-env plugin - certs 0.12.1 enabled dokku core certificate management plugin - checks 0.12.1 enabled dokku core checks plugin - common 0.12.1 enabled dokku core common plugin - config 0.12.1 enabled dokku core config plugin - docker-options 0.12.1 enabled dokku core docker-options plugin - domains 0.12.1 enabled dokku core domains plugin - enter 0.12.1 enabled dokku core enter plugin - git 0.12.1 enabled dokku core git plugin - logs 0.12.1 enabled dokku core logs plugin - named-containers 0.12.1 enabled dokku core named containers plugin - network 0.12.1 enabled dokku core network plugin - nginx-vhosts 0.12.1 enabled dokku core nginx-vhosts plugin - plugin 0.12.1 enabled dokku core plugin plugin - proxy 0.12.1 enabled dokku core proxy plugin - ps 0.12.1 enabled dokku core ps plugin - repo 0.12.1 enabled dokku core repo plugin - shell 0.12.1 enabled dokku core shell plugin - ssh-keys 0.12.1 enabled dokku core ssh-keys plugin - storage 0.12.1 enabled dokku core storage plugin - tags 0.12.1 enabled dokku core tags plugin - tar 0.12.1 enabled dokku core tar plugin + 00_dokku-standard 0.12.2 enabled dokku core standard plugin + 20_events 0.12.2 enabled dokku core events logging plugin + apps 0.12.2 enabled dokku core apps plugin + build-env 0.12.2 enabled dokku core build-env plugin + certs 0.12.2 enabled dokku core certificate management plugin + checks 0.12.2 enabled dokku core checks plugin + common 0.12.2 enabled dokku core common plugin + config 0.12.2 enabled dokku core config plugin + docker-options 0.12.2 enabled dokku core docker-options plugin + domains 0.12.2 enabled dokku core domains plugin + enter 0.12.2 enabled dokku core enter plugin + git 0.12.2 enabled dokku core git plugin + logs 0.12.2 enabled dokku core logs plugin + named-containers 0.12.2 enabled dokku core named containers plugin + network 0.12.2 enabled dokku core network plugin + nginx-vhosts 0.12.2 enabled dokku core nginx-vhosts plugin + plugin 0.12.2 enabled dokku core plugin plugin + proxy 0.12.2 enabled dokku core proxy plugin + ps 0.12.2 enabled dokku core ps plugin + repo 0.12.2 enabled dokku core repo plugin + shell 0.12.2 enabled dokku core shell plugin + ssh-keys 0.12.2 enabled dokku core ssh-keys plugin + storage 0.12.2 enabled dokku core storage plugin + tags 0.12.2 enabled dokku core tags plugin + tar 0.12.2 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 4f7f0355f..5897f47ee 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 5394bc181..60af8512e 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.12.1\/docs\/assets\/favicons\/android-chrome-36x36.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-36x36.png", "sizes": "36x36", "type": "image\/png", "density": "0.75" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.1\/docs\/assets\/favicons\/android-chrome-48x48.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-48x48.png", "sizes": "48x48", "type": "image\/png", "density": "1.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.1\/docs\/assets\/favicons\/android-chrome-72x72.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-72x72.png", "sizes": "72x72", "type": "image\/png", "density": "1.5" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.1\/docs\/assets\/favicons\/android-chrome-96x96.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-96x96.png", "sizes": "96x96", "type": "image\/png", "density": "2.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.1\/docs\/assets\/favicons\/android-chrome-144x144.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-144x144.png", "sizes": "144x144", "type": "image\/png", "density": "3.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.1\/docs\/assets\/favicons\/android-chrome-192x192.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/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 51cb8ffe8..1f1655154 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.rawgit.com/dokku/dokku/v0.12.1/docs/assets/dokku.png); + background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/dokku.png); text-indent: 40px; } .blurb { color: #424242; background-color: #ededed; - background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.1/docs/assets/gplaypattern.png); + background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/gplaypattern.png); padding: 45px 0; text-align: center; } @@ -65,7 +65,7 @@ h1 { display: block; line-height: 1.3em; margin: 45px auto; - max-width: 750px; + max-width: 860px; padding: 0; } .quickstart-code .title { @@ -151,7 +151,7 @@ h1 { font-size: 1.6em; line-height: 1.3em; margin: 45px auto; - max-width: 750px; + max-width: 860px; padding: 0; text-align: center; } diff --git a/docs/assets/versions.json b/docs/assets/versions.json index cc05ea4cc..9b6fc0784 100644 --- a/docs/assets/versions.json +++ b/docs/assets/versions.json @@ -9,6 +9,6 @@ "0.9.4", "0.10.5", "0.11.6", - "0.12.1" + "0.12.2" ] } diff --git a/docs/development/release-process.md b/docs/development/release-process.md index a72d54c32..2d08f19cd 100644 --- a/docs/development/release-process.md +++ b/docs/development/release-process.md @@ -30,7 +30,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.12.1-2 (Mon Feb 22 23:20:37 CET 2016)" +# wait for "==> build-arch: ==> Finished making: dokku 0.12.2-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 919b7069b..d949189c7 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.12.1/bootstrap.sh; -sudo DOKKU_TAG=v0.12.1 bash bootstrap.sh +wget https://raw.githubusercontent.com/dokku/dokku/v0.12.2/bootstrap.sh; +sudo DOKKU_TAG=v0.12.2 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 37467b159..14c06c487 100644 --- a/docs/home.html +++ b/docs/home.html @@ -10,30 +10,30 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + @@ -98,12 +98,12 @@

$ - wget https://raw.githubusercontent.com/dokku/dokku/v0.12.1/bootstrap.sh + wget https://raw.githubusercontent.com/dokku/dokku/v0.12.2/bootstrap.sh

$ - sudo DOKKU_TAG=v0.12.1 bash bootstrap.sh + sudo DOKKU_TAG=v0.12.2 bash bootstrap.sh

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

$ - echo "trusty utopic vivid wily xenial yakkety zesty artful bionic" | grep -q "$OS_ID" || OS_ID="trusty" + echo "utopicvividwilyxenialyakketyzestyartfulbionic" | grep -q "$OS_ID" || OS_ID="trusty"

diff --git a/docs/template.html b/docs/template.html index 230c8d737..8cea6a0fe 100644 --- a/docs/template.html +++ b/docs/template.html @@ -9,26 +9,26 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - +