Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a1bbc1ec4d | ||
|
|
793f1b6058 | ||
|
|
20977fc2a2 |
@@ -1,5 +1,9 @@
|
|||||||
# History
|
# History
|
||||||
|
|
||||||
|
## 0.3.5
|
||||||
|
|
||||||
|
- #784: @josegonzalez Fix NO_VHOST check
|
||||||
|
|
||||||
## 0.3.4
|
## 0.3.4
|
||||||
|
|
||||||
- #780: @josegonzalez Output error message when a command is not found. Closes #778
|
- #780: @josegonzalez Output error message when a command is not found. Closes #778
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S
|
|||||||
|
|
||||||
To install the latest stable version of dokku, you can run the following bootstrapper command:
|
To install the latest stable version of dokku, you can run the following bootstrapper command:
|
||||||
|
|
||||||
$ wget -qO- https://raw.github.com/progrium/dokku/v0.3.4/bootstrap.sh | sudo DOKKU_TAG=v0.3.4 bash
|
$ wget -qO- https://raw.github.com/progrium/dokku/v0.3.5/bootstrap.sh | sudo DOKKU_TAG=v0.3.5 bash
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ if ARGV[0] == "onboot"
|
|||||||
exit
|
exit
|
||||||
end
|
end
|
||||||
|
|
||||||
version = "v0.3.4"
|
version = "v0.3.5"
|
||||||
dokku_root = ENV["DOKKU_ROOT"] || "/home/dokku"
|
dokku_root = ENV["DOKKU_ROOT"] || "/home/dokku"
|
||||||
admin_key = `cat /root/.ssh/authorized_keys`.split("\n").first
|
admin_key = `cat /root/.ssh/authorized_keys`.split("\n").first
|
||||||
hostname = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
|
hostname = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Ubuntu 14.04 x64 x64. Ideally have a domain ready to point to your host. It's de
|
|||||||
To install the latest stable version of dokku, you can run the following bootstrapper command:
|
To install the latest stable version of dokku, you can run the following bootstrapper command:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
wget -qO- https://raw.github.com/progrium/dokku/v0.3.4/bootstrap.sh | sudo DOKKU_TAG=v0.3.4 bash
|
wget -qO- https://raw.github.com/progrium/dokku/v0.3.5/bootstrap.sh | sudo DOKKU_TAG=v0.3.5 bash
|
||||||
```
|
```
|
||||||
|
|
||||||
## Configuring
|
## Configuring
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ set +e
|
|||||||
NO_VHOST=$(dokku config:get $APP NO_VHOST)
|
NO_VHOST=$(dokku config:get $APP NO_VHOST)
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [[ -z "$NO_VHOST" ]]; then
|
if [[ -n "$NO_VHOST" ]]; then
|
||||||
echo "-----> NO_VHOST config detected"
|
echo "-----> NO_VHOST config detected"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -f "$DOKKU_ROOT/VHOST" && ! -z "$NO_VHOST" ]]; then
|
if [[ -f "$DOKKU_ROOT/VHOST" && ! -n "$NO_VHOST" ]]; then
|
||||||
VHOST=$(< "$DOKKU_ROOT/VHOST")
|
VHOST=$(< "$DOKKU_ROOT/VHOST")
|
||||||
SUBDOMAIN=${APP/%\.${VHOST}/}
|
SUBDOMAIN=${APP/%\.${VHOST}/}
|
||||||
hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST)
|
hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST)
|
||||||
|
|||||||
Reference in New Issue
Block a user