Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2026-02-23 19:50:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

only run domains and nginx config if we have a port and ip. fixes #1355

Browse Source
This commit is contained in:
Michael Hobbs
2015-07-30 14:29:36 -07:00
parent b0d55ce589
commit 11e10fceef
7 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/nginx-vhosts/post-deploy
View File

@@ -3,12 +3,14 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname $0)/../common/functions"
APP="$1"
NO_VHOST=$(dokku config:get $APP NO_VHOST || true)
if [[ -f "$DOKKU_ROOT/$APP/IP.web.1" ]] && [[ -f "$DOKKU_ROOT/$APP/PORT.web.1" ]]; then
NO_VHOST=$(dokku config:get $APP NO_VHOST || true)
if [[ -n "$NO_VHOST" ]]; then
dokku_log_info1 "NO_VHOST config detected"
elif [[ ! -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
dokku domains:setup $APP
if [[ -n "$NO_VHOST" ]]; then
dokku_log_info1 "NO_VHOST config detected"
elif [[ ! -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
dokku domains:setup $APP
fi
dokku nginx:build-config $APP
fi
dokku nginx:build-config $APP

5
tests.mk
View File

@@ -119,6 +119,10 @@ deploy-test-nodejs-express-noprocfile:
@echo deploying nodejs-express app with no Procfile...
cd tests && ./test_deploy ./apps/nodejs-express-noprocfile dokku.me
deploy-test-nodejs-worker:
@echo deploying nodejs-worker app...
cd tests && ./test_deploy ./apps/nodejs-worker dokku.me
deploy-test-php:
@echo deploying php app...
cd tests && ./test_deploy ./apps/php dokku.me
@@ -152,6 +156,7 @@ deploy-tests:
@$(QUIET) $(MAKE) deploy-test-multi
@$(QUIET) $(MAKE) deploy-test-nodejs-express
@$(QUIET) $(MAKE) deploy-test-nodejs-express-noprocfile
@$(QUIET) $(MAKE) deploy-test-nodejs-worker
@$(QUIET) $(MAKE) deploy-test-php
@$(QUIET) $(MAKE) deploy-test-python-flask
@$(QUIET) $(MAKE) deploy-test-scala

2
tests/apps/nodejs-worker/DOKKU_SCALE Normal file
View File

@@ -0,0 +1,2 @@
web=0
worker=1

1
tests/apps/nodejs-worker/Procfile Normal file
View File

@@ -0,0 +1 @@
worker: node worker.js

2
tests/apps/nodejs-worker/check_deploy Executable file
View File

@@ -0,0 +1,2 @@
#!/usr/bin/env bash
set -e; output="$(pgrep -f "node worker.js" | wc -l)"; echo "$output"; test "$output" == "1"

8
tests/apps/nodejs-worker/package.json Normal file
View File

@@ -0,0 +1,8 @@
{
"name": "node-example",
"version": "0.0.1",
"engines": {
"node": "0.10.x",
"npm": "2.7.x"
}
}

6
tests/apps/nodejs-worker/worker.js Normal file
View File

@@ -0,0 +1,6 @@
function worker() {
console.log('sleeping for 60 seconds');
setTimeout(worker, 60 * 1000);
}
worker();