diff --git a/tests/apps/checks-root/CHECKS b/tests/apps/checks-root/CHECKS deleted file mode 100644 index 4bc292597..000000000 --- a/tests/apps/checks-root/CHECKS +++ /dev/null @@ -1,2 +0,0 @@ -ATTEMPTS=2 -/ diff --git a/tests/apps/checks-root/app.json b/tests/apps/checks-root/app.json new file mode 100644 index 000000000..0c12a6d97 --- /dev/null +++ b/tests/apps/checks-root/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "attempts": 2, + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/dockerfile-app-json-formations/CHECKS b/tests/apps/dockerfile-app-json-formations/CHECKS deleted file mode 100644 index 068926825..000000000 --- a/tests/apps/dockerfile-app-json-formations/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ nodejs/express diff --git a/tests/apps/dockerfile-app-json-formations/app.json b/tests/apps/dockerfile-app-json-formations/app.json index be4658045..4b341198d 100644 --- a/tests/apps/dockerfile-app-json-formations/app.json +++ b/tests/apps/dockerfile-app-json-formations/app.json @@ -1,7 +1,20 @@ { - "formation": { - "web": { - "quantity": 1 - } + "formation": { + "web": { + "quantity": 1 } + }, + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "nodejs/express", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + } } \ No newline at end of file diff --git a/tests/apps/dockerfile-noexpose/CHECKS b/tests/apps/dockerfile-noexpose/CHECKS deleted file mode 100644 index 034f4c73c..000000000 --- a/tests/apps/dockerfile-noexpose/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ Hello World! diff --git a/tests/apps/dockerfile-noexpose/app.json b/tests/apps/dockerfile-noexpose/app.json new file mode 100644 index 000000000..a82fa63b4 --- /dev/null +++ b/tests/apps/dockerfile-noexpose/app.json @@ -0,0 +1,15 @@ +{ + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "Hello World!", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/dockerfile-procfile-bad/CHECKS b/tests/apps/dockerfile-procfile-bad/CHECKS deleted file mode 100644 index 068926825..000000000 --- a/tests/apps/dockerfile-procfile-bad/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ nodejs/express diff --git a/tests/apps/dockerfile-procfile-bad/app.json b/tests/apps/dockerfile-procfile-bad/app.json new file mode 100644 index 000000000..ae6ec4b08 --- /dev/null +++ b/tests/apps/dockerfile-procfile-bad/app.json @@ -0,0 +1,15 @@ +{ + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "nodejs/express", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/dockerfile-procfile/CHECKS b/tests/apps/dockerfile-procfile/CHECKS deleted file mode 100644 index 068926825..000000000 --- a/tests/apps/dockerfile-procfile/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ nodejs/express diff --git a/tests/apps/dockerfile-procfile/app.json b/tests/apps/dockerfile-procfile/app.json index 0dbdea3ec..58d88012f 100644 --- a/tests/apps/dockerfile-procfile/app.json +++ b/tests/apps/dockerfile-procfile/app.json @@ -1,8 +1,21 @@ { + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "nodejs/express", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + }, "scripts": { "dokku": { - "predeploy": "touch /app/predeploy.test", - "postdeploy": "touch /app/postdeploy.test" + "postdeploy": "touch /app/postdeploy.test", + "predeploy": "touch /app/predeploy.test" } } -} +} \ No newline at end of file diff --git a/tests/apps/dockerfile/CHECKS b/tests/apps/dockerfile/CHECKS deleted file mode 100644 index 034f4c73c..000000000 --- a/tests/apps/dockerfile/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ Hello World! diff --git a/tests/apps/dockerfile/app.json b/tests/apps/dockerfile/app.json index 6c39f8703..c2155af18 100644 --- a/tests/apps/dockerfile/app.json +++ b/tests/apps/dockerfile/app.json @@ -1,20 +1,14 @@ { - "name": "Sample node.js express app", - "description": "Used in dokku's test suite", - "keywords": [ - "nodejs", - "express", - "testing" + "addons": [ + "dokku-postgres", + "dokku-redis" ], - "website": "https://dokku.com/docs/", - "repository": "https://github.com/dokku/dokku", - "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", - "scripts": { - "dokku": { - "predeploy": "mkdir -p /app && touch /app/predeploy.test", - "postdeploy": "mkdir -p /app && touch /app/postdeploy.test" + "buildpacks": [ + { + "url": "https://github.com/heroku/heroku-buildpack-nodejs" } - }, + ], + "description": "Used in dokku's test suite", "env": { "SECRET_TOKEN": { "description": "A secret key for verifying the integrity of signed cookies.", @@ -25,14 +19,33 @@ "generator": "echo 5" } }, + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "Hello World!", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + }, "image": "gliderlabs/herokuish:latest-22", - "addons": [ - "dokku-postgres", - "dokku-redis" + "keywords": [ + "nodejs", + "express", + "testing" ], - "buildpacks": [ - { - "url": "https://github.com/heroku/heroku-buildpack-nodejs" + "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", + "name": "Sample node.js express app", + "repository": "https://github.com/dokku/dokku", + "scripts": { + "dokku": { + "postdeploy": "mkdir -p /app \u0026\u0026 touch /app/postdeploy.test", + "predeploy": "mkdir -p /app \u0026\u0026 touch /app/predeploy.test" } - ] -} + }, + "website": "https://dokku.com/docs/" +} \ No newline at end of file diff --git a/tests/apps/gitsubmodules/CHECKS b/tests/apps/gitsubmodules/CHECKS deleted file mode 100644 index 1be994966..000000000 --- a/tests/apps/gitsubmodules/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ Hello diff --git a/tests/apps/gitsubmodules/app.json b/tests/apps/gitsubmodules/app.json new file mode 100644 index 000000000..743532740 --- /dev/null +++ b/tests/apps/gitsubmodules/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "Hello", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/go-fail-postdeploy/CHECKS b/tests/apps/go-fail-postdeploy/CHECKS deleted file mode 100644 index 52e1189c7..000000000 --- a/tests/apps/go-fail-postdeploy/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ go diff --git a/tests/apps/go-fail-postdeploy/app.json b/tests/apps/go-fail-postdeploy/app.json index 677a4df21..77352b471 100644 --- a/tests/apps/go-fail-postdeploy/app.json +++ b/tests/apps/go-fail-postdeploy/app.json @@ -1,17 +1,27 @@ { - "name": "Sample go app", - "description": "Used in dokku's test suite", - "website": "https://dokku.com/docs/", - "repository": "https://github.com/dokku/dokku", - "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", - "scripts": { - "dokku": { - "postdeploy": "touch /app/postdeploy.test && ls -la /app" - } - }, "buildpacks": [ { "url": "https://github.com/heroku/heroku-buildpack-go" } - ] -} + ], + "description": "Used in dokku's test suite", + "healthchecks": { + "web": [ + { + "content": "go", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + }, + "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", + "name": "Sample go app", + "repository": "https://github.com/dokku/dokku", + "scripts": { + "dokku": { + "postdeploy": "touch /app/postdeploy.test \u0026\u0026 ls -la /app" + } + }, + "website": "https://dokku.com/docs/" +} \ No newline at end of file diff --git a/tests/apps/go-fail-predeploy/CHECKS b/tests/apps/go-fail-predeploy/CHECKS deleted file mode 100644 index 52e1189c7..000000000 --- a/tests/apps/go-fail-predeploy/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ go diff --git a/tests/apps/go-fail-predeploy/app.json b/tests/apps/go-fail-predeploy/app.json index 94ea57a6d..a5f72478f 100644 --- a/tests/apps/go-fail-predeploy/app.json +++ b/tests/apps/go-fail-predeploy/app.json @@ -1,17 +1,27 @@ { - "name": "Sample go app", - "description": "Used in dokku's test suite", - "website": "https://dokku.com/docs/", - "repository": "https://github.com/dokku/dokku", - "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", - "scripts": { - "dokku": { - "predeploy": "touch /app/predeploy.test && ls -la /app" - } - }, "buildpacks": [ { "url": "https://github.com/heroku/heroku-buildpack-go" } - ] -} + ], + "description": "Used in dokku's test suite", + "healthchecks": { + "web": [ + { + "content": "go", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + }, + "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", + "name": "Sample go app", + "repository": "https://github.com/dokku/dokku", + "scripts": { + "dokku": { + "predeploy": "touch /app/predeploy.test \u0026\u0026 ls -la /app" + } + }, + "website": "https://dokku.com/docs/" +} \ No newline at end of file diff --git a/tests/apps/go/CHECKS b/tests/apps/go/CHECKS deleted file mode 100644 index 52e1189c7..000000000 --- a/tests/apps/go/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ go diff --git a/tests/apps/go/app.json b/tests/apps/go/app.json new file mode 100644 index 000000000..36e31ada7 --- /dev/null +++ b/tests/apps/go/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "go", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/java/CHECKS b/tests/apps/java/CHECKS deleted file mode 100644 index e15e203ed..000000000 --- a/tests/apps/java/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ Hello from Java diff --git a/tests/apps/java/app.json b/tests/apps/java/app.json new file mode 100644 index 000000000..125e3c7b2 --- /dev/null +++ b/tests/apps/java/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "Hello from Java", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/multi/CHECKS b/tests/apps/multi/CHECKS deleted file mode 100644 index 9d3f9b3af..000000000 --- a/tests/apps/multi/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ Heroku Multi Buildpack on Dokku diff --git a/tests/apps/multi/app.json b/tests/apps/multi/app.json new file mode 100644 index 000000000..3b2c20efa --- /dev/null +++ b/tests/apps/multi/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "Heroku Multi Buildpack on Dokku", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/nodejs-express-noappjson/CHECKS b/tests/apps/nodejs-express-noappjson/CHECKS deleted file mode 100644 index 67d14794a..000000000 --- a/tests/apps/nodejs-express-noappjson/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ nodejs/express \ No newline at end of file diff --git a/tests/apps/nodejs-express-noappjson/app.json b/tests/apps/nodejs-express-noappjson/app.json new file mode 100644 index 000000000..ae6ec4b08 --- /dev/null +++ b/tests/apps/nodejs-express-noappjson/app.json @@ -0,0 +1,15 @@ +{ + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "nodejs/express", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/nodejs-express-noprocfile/CHECKS b/tests/apps/nodejs-express-noprocfile/CHECKS deleted file mode 100644 index f1d88bab3..000000000 --- a/tests/apps/nodejs-express-noprocfile/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ nodejs/express diff --git a/tests/apps/nodejs-express-noprocfile/app.json b/tests/apps/nodejs-express-noprocfile/app.json new file mode 100644 index 000000000..b6ce34d81 --- /dev/null +++ b/tests/apps/nodejs-express-noprocfile/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "nodejs/express", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/nodejs-express/CHECKS b/tests/apps/nodejs-express/CHECKS deleted file mode 100644 index 67d14794a..000000000 --- a/tests/apps/nodejs-express/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ nodejs/express \ No newline at end of file diff --git a/tests/apps/nodejs-express/app.json b/tests/apps/nodejs-express/app.json index 918760d5f..0729bdcfc 100644 --- a/tests/apps/nodejs-express/app.json +++ b/tests/apps/nodejs-express/app.json @@ -1,20 +1,14 @@ { - "name": "Sample node.js express app", - "description": "Used in dokku's test suite", - "keywords": [ - "nodejs", - "express", - "testing" + "addons": [ + "dokku-postgres", + "dokku-redis" ], - "website": "https://dokku.com/docs/", - "repository": "https://github.com/dokku/dokku", - "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", - "scripts": { - "dokku": { - "predeploy": "touch /app/predeploy.test", - "postdeploy": "touch /app/postdeploy.test" + "buildpacks": [ + { + "url": "https://github.com/heroku/heroku-buildpack-nodejs" } - }, + ], + "description": "Used in dokku's test suite", "env": { "SECRET_TOKEN": { "description": "A secret key for verifying the integrity of signed cookies.", @@ -25,14 +19,33 @@ "generator": "echo 5" } }, + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "nodejs/express", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + }, "image": "gliderlabs/herokuish:latest-22", - "addons": [ - "dokku-postgres", - "dokku-redis" + "keywords": [ + "nodejs", + "express", + "testing" ], - "buildpacks": [ - { - "url": "https://github.com/heroku/heroku-buildpack-nodejs" + "logo": "https://raw.githubusercontent.com/dokku/dokku/master/docs/assets/dokku.png", + "name": "Sample node.js express app", + "repository": "https://github.com/dokku/dokku", + "scripts": { + "dokku": { + "postdeploy": "touch /app/postdeploy.test", + "predeploy": "touch /app/predeploy.test" } - ] -} + }, + "website": "https://dokku.com/docs/" +} \ No newline at end of file diff --git a/tests/apps/php/CHECKS b/tests/apps/php/CHECKS deleted file mode 100644 index d75864ad6..000000000 --- a/tests/apps/php/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/

php

diff --git a/tests/apps/php/app.json b/tests/apps/php/app.json new file mode 100644 index 000000000..a1fce7a1c --- /dev/null +++ b/tests/apps/php/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "\u003chtml\u003e\u003ch3\u003ephp\u003c/h3\u003e\u003c/html\u003e", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/python-flask/CHECKS b/tests/apps/python-flask/CHECKS deleted file mode 100644 index 6d804388b..000000000 --- a/tests/apps/python-flask/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ python/flask diff --git a/tests/apps/python-flask/app.json b/tests/apps/python-flask/app.json new file mode 100644 index 000000000..3dd6806d2 --- /dev/null +++ b/tests/apps/python-flask/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "python/flask", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/python/CHECKS b/tests/apps/python/CHECKS deleted file mode 100644 index 52a9225d1..000000000 --- a/tests/apps/python/CHECKS +++ /dev/null @@ -1,5 +0,0 @@ -WAIT=2 # wait 2 seconds -TIMEOUT=5 # set timeout to 5 seconds -ATTEMPTS=2 # try 2 times - -/ python/http.server diff --git a/tests/apps/python/app.json b/tests/apps/python/app.json index 0dbdea3ec..698956d99 100644 --- a/tests/apps/python/app.json +++ b/tests/apps/python/app.json @@ -1,8 +1,21 @@ { + "healthchecks": { + "web": [ + { + "attempts": 2, + "content": "python/http.server", + "name": "check-1", + "path": "/", + "timeout": 5, + "type": "startup", + "wait": 2 + } + ] + }, "scripts": { "dokku": { - "predeploy": "touch /app/predeploy.test", - "postdeploy": "touch /app/postdeploy.test" + "postdeploy": "touch /app/postdeploy.test", + "predeploy": "touch /app/predeploy.test" } } -} +} \ No newline at end of file diff --git a/tests/apps/ruby/CHECKS b/tests/apps/ruby/CHECKS deleted file mode 100644 index 69236ed63..000000000 --- a/tests/apps/ruby/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ Hello, world diff --git a/tests/apps/ruby/app.json b/tests/apps/ruby/app.json new file mode 100644 index 000000000..47f2b0f4b --- /dev/null +++ b/tests/apps/ruby/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "Hello, world", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/static/CHECKS b/tests/apps/static/CHECKS deleted file mode 100644 index 925fdea20..000000000 --- a/tests/apps/static/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ Static Page diff --git a/tests/apps/static/app.json b/tests/apps/static/app.json new file mode 100644 index 000000000..dc26105bb --- /dev/null +++ b/tests/apps/static/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "Static Page", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/zombies-buildpack/CHECKS b/tests/apps/zombies-buildpack/CHECKS deleted file mode 100644 index 52e1189c7..000000000 --- a/tests/apps/zombies-buildpack/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ go diff --git a/tests/apps/zombies-buildpack/app.json b/tests/apps/zombies-buildpack/app.json new file mode 100644 index 000000000..36e31ada7 --- /dev/null +++ b/tests/apps/zombies-buildpack/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "go", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/zombies-dockerfile-no-tini/CHECKS b/tests/apps/zombies-dockerfile-no-tini/CHECKS deleted file mode 100644 index 52e1189c7..000000000 --- a/tests/apps/zombies-dockerfile-no-tini/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ go diff --git a/tests/apps/zombies-dockerfile-no-tini/app.json b/tests/apps/zombies-dockerfile-no-tini/app.json new file mode 100644 index 000000000..36e31ada7 --- /dev/null +++ b/tests/apps/zombies-dockerfile-no-tini/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "go", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file diff --git a/tests/apps/zombies-dockerfile-tini/CHECKS b/tests/apps/zombies-dockerfile-tini/CHECKS deleted file mode 100644 index 52e1189c7..000000000 --- a/tests/apps/zombies-dockerfile-tini/CHECKS +++ /dev/null @@ -1 +0,0 @@ -/ go diff --git a/tests/apps/zombies-dockerfile-tini/app.json b/tests/apps/zombies-dockerfile-tini/app.json new file mode 100644 index 000000000..36e31ada7 --- /dev/null +++ b/tests/apps/zombies-dockerfile-tini/app.json @@ -0,0 +1,12 @@ +{ + "healthchecks": { + "web": [ + { + "content": "go", + "name": "check-1", + "path": "/", + "type": "startup" + } + ] + } +} \ No newline at end of file