diff --git a/HISTORY.md b/HISTORY.md index b12871571..47560f360 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,56 @@ # History +## 0.4.4 + +This release adds a few interesting changes: + +- The `dokku logs` command now roughly maps to the `heroku logs` command, and supports most available options. +- Native Microsoft Azure support is now available! +- Quite a few shellcheck issues were fixed thanks to @callahad! +- Experimental debian installation support. Going forward, we will try and make dokku compatible with all systemd installations, as well as investigate dockerfile-based deployment to continue simplifying installation. + +Thanks to all our contributors for making this release great! + +### Bug Fixes + +- #1606: @josegonzalez Install plugn 0.2.0 in Makefile installs +- #1643: @Flink Fix generated nginx config when NO_VHOST=1 +- #1644: @mmerickel Watch dokku events through a logrotate +- #1647: @callahad Resolve SC2115: 'Use "${var:?}" to ensure this never expands to /' +- #1648: @callahad Resolve SC2154: 'variable is referenced but not assigned' +- #1649: @callahad Resolve SC2164: 'Use cd ... || exit in case cd fails.' +- #1650: @callahad Resolve SC2148: 'target shell is unknown' +- #1651: @callahad Resolve SC2029: 'this expands on client side' +- #1652: @callahad Resolve SC2143: 'Instead of [ -n $(foo | grep bar) ], use foo | grep -q bar' +- #1653: @callahad Resolve SC2145: 'Argument mixes string and array.' +- #1655: @callahad Resolve SC2162: 'read without -r mangles backslashes' +- #1656: @callahad Resolve SC2001: 'See if you can use ${var//search/replace} instead' +- #1660: @callahad Fixup debian/control for Debian +- #1662: @xadh00m Only return users of group 'adm' + +### New Features + +- #1607: @josegonzalez Dokku support for Debian Jessie installation +- #1610: @kdomanski Add post-stop plugn trigger +- #1612: @Flink Add multiple options to the logs plugin +- #1613: @kdomanski Add ps:restore to start applications which weren't manually stopped +- #1628: @michaelshobbs Move RESTORE variable to DOKKU_APP namespace +- #1634: @callahad Allow installation of bats via homebrew +- #1645: @rvalyi Add ability to access git repo via ssh +- #1664: @michaelshobbs Add $REV to pre-receive-app call + +### Documentation + +- #1605: @josegonzalez Make commented output a bit more readable +- #1621: @josegonzalez Document `--force` option for `:destroy` commands +- #1623: @sedouard Add Azure Documentation +- #1624: @u2mejc Add trace to help output +- #1626: @josegonzalez Add official dokku-copy-files-to-image plugin +- #1630: @adamwolf Enabling tracing is actually 'dokku trace on' +- #1633: @elia Add a warning regarding the use of `trace on` +- #1635: @callahad Remove deprecated Linode stackscript +- #1657: @kimausloos Various small doc updates + ## 0.4.3 This release was mainly a documentation release/bugfix. @@ -8,7 +59,7 @@ One major removal was is that as of 0.4.3, we no longer restart containers autom If desired, you may replicate this functionality using the official `docker-options` plugin. -## Bug Fixes +### Bug Fixes - #1560: @darklow Fixes issue where SSL and non-SSL templates cannot be used at the same time - #1566: @michaelshobbs Fix logic error in enabling nginx @@ -20,7 +71,7 @@ If desired, you may replicate this functionality using the official `docker-opti - #1603: @josegonzalez Add missing plugin triggers Quiet client #1568 -## New Features +### New Features - #1490: @vijayviji Add windows-specific vagrant setup - #1563: @kdomanski Cleanup all dead containers in dokku cleanup @@ -28,7 +79,7 @@ Quiet client #1568 - #1600: @josegonzalez Upgrade to Herokuish 0.3.4 - #1602: @josegonzalez Add pre-receive-app plugin trigger -## Documentation +### Documentation - #1556: @josegonzalez Use proper cdn link for css asset - #1557: @josegonzalez Code styling changes @@ -212,7 +263,7 @@ This release is a bugfix release covering dokku packaging. - #1397: @josegonzalez Use https docker apt repo - #1394: @josegonzalez Remove `dokku plugins-install` from postinst hook -### Docs Changes +### Documentation - #1395: @adrianmoya Adding fqdn requirement @@ -239,7 +290,7 @@ This release is a bugfix release mostly covering installation and nginx issues. - #1359: @michaelshobbs allow DOKKU_WAIT_TO_RETIRE to be defined per app - #1365: @michaelshobbs support dockerfile images that don't include bash -### Docs Changes +### Documentation - #1305: @josegonzalez Updated documentation site - #1321: @fwolfst Mention alternative to nginx.conf templates: include-dir. @@ -278,7 +329,7 @@ This release is a general bugfix release, with improvements to handling of nginx - #1291: @michaelshobbs Refactored interface for managing global/local app configuration - #1299: @SonicHedgehog Set X-Forwarded-Proto header if TLS is enabled when running checks -### Docs Changes +### Documentation - #1273: @alessio Add docs for the events plugin - #1276: @josegonzalez Reorder and deprecate a few plugins @@ -319,7 +370,7 @@ This release pegs Dokku to Docker 1.6.2. Docker 1.7.0 introduced changes in `doc - #1251: @josegonzalez Fallback to using /etc/init.d/nginx reload directly to restart nginx - #1264: @josegonzalez Require lxc-docker-1.6.2 -### Docs Changes +### Documentation - #1252: @josegonzalez Fix ssh port for vagrant installation. Closes #1139. [ci skip] - #1250: @josegonzalez SSL documentation is misleading @@ -346,7 +397,7 @@ This release pegs Dokku to Docker 1.6.2. Docker 1.7.0 introduced changes in `doc - #1227: @Flink Use --no-cache when building Dockerfile - #1246: @josegonzalez Ensure we call apt-get before installing packages -### Docs Changes +### Documentation - #1168: @cjblomqvist [docs] Update git-rev plugin to point to maintained version - #1180: @sherbondy [docs] Clarify usage around official dokku `docker-options` plugin diff --git a/README.md b/README.md index 07bf705fa..1af443220 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/progrium/dokku/v0.4.3/bootstrap.sh - sudo DOKKU_TAG=v0.4.3 bash bootstrap.sh + wget https://raw.githubusercontent.com/progrium/dokku/v0.4.4/bootstrap.sh + sudo DOKKU_TAG=v0.4.4 bash bootstrap.sh ### Upgrading diff --git a/contrib/dokku-installer.rb b/contrib/dokku-installer.rb index 638814c11..e603b364d 100755 --- a/contrib/dokku-installer.rb +++ b/contrib/dokku-installer.rb @@ -32,7 +32,7 @@ if ARGV[0] == "onboot" exit end -version = "v0.4.3" +version = "v0.4.4" dokku_root = ENV["DOKKU_ROOT"] || "/home/dokku" admin_keys = `cat /root/.ssh/authorized_keys`.split("\n") hostname = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip diff --git a/deb.mk b/deb.mk index 2842fea47..25d7d08a2 100644 --- a/deb.mk +++ b/deb.mk @@ -131,7 +131,7 @@ deb-plugn: deb-setup sudo apt-get install -qq -y git golang mercurial > /dev/null 2>&1 export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && go get github.com/progrium/plugn export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && make deps - export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && go build -o plugn + export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && rm plugn && go build -o plugn mv /home/vagrant/gocode/src/github.com/progrium/plugn/plugn /tmp/build/usr/local/bin/plugn echo "-> Creating $(PLUGN_PACKAGE_NAME)" diff --git a/debian/control b/debian/control index 442e838f5..db4d6c576 100644 --- a/debian/control +++ b/debian/control @@ -1,12 +1,9 @@ Package: dokku -Version: 0.4.3 +Version: 0.4.4 Section: web Priority: optional Architecture: amd64 -Depends: locales, git, make, curl, gcc, man-db, herokuish, sshcommand, - docker-engine-cs | docker-engine | lxc-docker (>= 1.6.2) | docker.io (>= 1.6.2), - software-properties-common, python-software-properties -Pre-Depends: nginx (>= 1.4.6), dnsutils, apparmor, cgroupfs-mount | cgroup-lite, plugn, sudo, - ruby, ruby-dev, rubygem-rack , rubygem-rack-protection, rubygem-sinatra, rubygem-tilt +Depends: locales, git, make, curl, gcc, man-db, herokuish, sshcommand, docker-engine-cs | docker-engine | lxc-docker (>= 1.6.2) | docker.io (>= 1.6.2), software-properties-common, python-software-properties +Pre-Depends: nginx (>= 1.4.6), dnsutils, apparmor, cgroupfs-mount | cgroup-lite, plugn, sudo, ruby, ruby-dev, rubygem-rack , rubygem-rack-protection, rubygem-sinatra, rubygem-tilt Maintainer: Jose Diaz-Gonzalez Description: Docker powered mini-Heroku in around 100 lines of Bash diff --git a/docs/assets/favicons/browserconfig.xml b/docs/assets/favicons/browserconfig.xml index 24c754783..b315f8518 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 1e0824b7b..12bcf7581 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.3\/docs\/assets\/favicons\/android-chrome-36x36.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.4\/docs\/assets\/favicons\/android-chrome-36x36.png", "sizes": "36x36", "type": "image\/png", "density": "0.75" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.3\/docs\/assets\/favicons\/android-chrome-48x48.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.4\/docs\/assets\/favicons\/android-chrome-48x48.png", "sizes": "48x48", "type": "image\/png", "density": "1.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.3\/docs\/assets\/favicons\/android-chrome-72x72.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.4\/docs\/assets\/favicons\/android-chrome-72x72.png", "sizes": "72x72", "type": "image\/png", "density": "1.5" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.3\/docs\/assets\/favicons\/android-chrome-96x96.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.4\/docs\/assets\/favicons\/android-chrome-96x96.png", "sizes": "96x96", "type": "image\/png", "density": "2.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.3\/docs\/assets\/favicons\/android-chrome-144x144.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.4\/docs\/assets\/favicons\/android-chrome-144x144.png", "sizes": "144x144", "type": "image\/png", "density": "3.0" }, { - "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.3\/docs\/assets\/favicons\/android-chrome-192x192.png", + "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.4\/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 86b4147d3..c7eb102de 100644 --- a/docs/assets/style.css +++ b/docs/assets/style.css @@ -25,7 +25,7 @@ h1 { padding: 0 0 0 1em; } .header a { - background-image: url(https://cdn.rawgit.com/progrium/dokku/v0.4.3/docs/assets/dokku.png); + background-image: url(https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/dokku.png); color: #fff; text-indent: 40px; background-position: center left; @@ -40,7 +40,7 @@ h1 { .blurb { color: #424242; background-color: #ededed; - background-image: url(https://cdn.rawgit.com/progrium/dokku/v0.4.3/docs/assets/gplaypattern.png); + background-image: url(https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/gplaypattern.png); padding: 45px 0; text-align: center; } diff --git a/docs/development/release-process.md b/docs/development/release-process.md index 5257bf571..1b8b0798d 100644 --- a/docs/development/release-process.md +++ b/docs/development/release-process.md @@ -4,19 +4,19 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas To propose a release, the following tasks need to be performed: -- The installable version must be changed in the `docs/installation.md` file. +- The installable version must be changed in the `contrib/dokku-installer.rb` file. +- The installable version must be changed in the `debian/control` file. - The installable version must be changed in the `docs/home.html` file - The installable version must be changed in the `docs/index.md` file -- The installable version must be changed in the `README.md` file. -- The installable version must be changed in the `contrib/dokku-installer.rb` file. +- The installable version must be changed in the `docs/installation.md` file. - The installable version must be changed in the `docs/template.html` file. -- The installable version must be changed in the `debian/control` file. +- The installable version must be changed in the `README.md` file. - The embedded css should be cleared in the `docs/template.html` 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/assets/style.css` file. - The versioned links should be updated in the `docs/assets/favicons/browserconfig.xml` file. - The versioned links should be updated in the `docs/assets/favicons/manifest.json` file. +- 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. - A list of changes must be made in the `HISTORY.md`. - A tag must be created locally with your release version diff --git a/docs/home.html b/docs/home.html index 375921ad8..797a927f3 100644 --- a/docs/home.html +++ b/docs/home.html @@ -10,26 +10,26 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + @@ -45,6 +45,7 @@ .quickstart-code .shell{background-color:#171717;font-family:Menlo,Consolas,"Courier New",Courier,"Liberation Mono",monospace;margin:0 20px;padding:20px;text-shadow:none;border-radius:0 0 5px 5px;box-shadow:0 5px 30px rgba(0,0,0,0.3)} .quickstart-code .line{display:block;margin:0;padding:0} .quickstart-code .line span{display:inline-block} + .quickstart-code .line .output{color:#aaaaaa;} .quickstart-code .path{color:#2a8fbd;user-select:none} .quickstart-code .prompt{color:#f90;user-select:none} .quickstart-code .command{color:#ffc} @@ -86,12 +87,12 @@

~ $ - wget https://raw.githubusercontent.com/progrium/dokku/v0.4.3/bootstrap.sh + wget https://raw.githubusercontent.com/progrium/dokku/v0.4.4/bootstrap.sh

~ $ - sudo DOKKU_TAG=v0.4.3 bash bootstrap.sh + sudo DOKKU_TAG=v0.4.4 bash bootstrap.sh

# => Go to your server's IP and follow the web installer diff --git a/docs/index.md b/docs/index.md index 425a6683e..66cbedacf 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,12 +15,12 @@

~ $ - wget https://raw.githubusercontent.com/progrium/dokku/v0.4.3/bootstrap.sh + wget https://raw.githubusercontent.com/progrium/dokku/v0.4.4/bootstrap.sh

~ $ - sudo DOKKU_TAG=v0.4.3 bash bootstrap.sh + sudo DOKKU_TAG=v0.4.4 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 a49604826..62522994e 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/progrium/dokku/v0.4.3/bootstrap.sh -sudo DOKKU_TAG=v0.4.3 bash bootstrap.sh +wget https://raw.githubusercontent.com/progrium/dokku/v0.4.4/bootstrap.sh +sudo DOKKU_TAG=v0.4.4 bash bootstrap.sh ``` The installation process takes about 5-10 minutes, depending upon internet connection speed. diff --git a/docs/template.html b/docs/template.html index 292717f7d..4e69227d7 100644 --- a/docs/template.html +++ b/docs/template.html @@ -10,34 +10,31 @@ Dokku - The smallest PaaS implementation you've ever seen - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - +