github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6275 from dokku/6205-update-checks-warning

Browse Source 
Update message referencing CHECKS file usage to app.json
This commit is contained in:
Jose Diaz-Gonzalez
2023-10-15 01:28:24 -04:00
committed by GitHub
parent 4c2f939480 8a15779c8d
commit 44716c7146
48 changed files with 376 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/dependencies.json
View File

@@ -11,11 +11,11 @@
},
{
"name": "docker-container-healthchecker",
"version": "0.6.4",
"version": "0.7.1",
"urls": {
"amd64": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.6.4/docker-container-healthchecker_0.6.4_linux_amd64.tgz",
"arm4": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.6.4/docker-container-healthchecker_0.6.4_linux_arm64.tgz",
"arm": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.6.4/docker-container-healthchecker_0.6.4_linux_armhf.tgz"
"amd64": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.7.1/docker-container-healthchecker_0.7.1_linux_amd64.tgz",
"arm4": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.7.1/docker-container-healthchecker_0.7.1_linux_arm64.tgz",
"arm": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.7.1/docker-container-healthchecker_0.7.1_linux_armhf.tgz"
}
},
{

11
plugins/scheduler-docker-local/pre-deploy
View File

@@ -67,10 +67,15 @@ scheduler-docker-local-pre-deploy-precheck() {
declare APP="$1"
dokku_log_info2 "Processing deployment checks"
if ! fn-scheduler-docker-local-has-checks-file "$APP"; then
local TMP_APP_JSON_OUTPUT=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
trap "rm -rf '$TMP_APP_JSON_OUTPUT' >/dev/null" RETURN INT TERM EXIT
plugn trigger app-json-get-content "$APP" >"$TMP_APP_JSON_OUTPUT"
if ! docker-container-healthchecker exists web --app-json "$TMP_APP_JSON_OUTPUT"; then
local CHECKS_URL="${DOKKU_CHECKS_URL:-https://dokku.com/docs/deployment/zero-downtime-deploys/}"
dokku_log_verbose "No CHECKS file found. Simple container checks will be performed."
dokku_log_verbose "For more efficient zero downtime deployments, create a CHECKS file. See ${CHECKS_URL} for examples"
dokku_log_verbose "No web healthchecks found in app.json. Simple container checks will be performed."
dokku_log_verbose "For more efficient zero downtime deployments, add healthchecks to your app.json. See ${CHECKS_URL} for examples"
fi
}

2
tests/apps/checks-root/CHECKS
View File

@@ -1,2 +0,0 @@
ATTEMPTS=2
/

12
tests/apps/checks-root/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"attempts": 2,
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

5
tests/apps/dockerfile-app-json-formations/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ nodejs/express

21
tests/apps/dockerfile-app-json-formations/app.json
View File

@@ -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
}
]
}
}

5
tests/apps/dockerfile-noexpose/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ Hello World!

15
tests/apps/dockerfile-noexpose/app.json Normal file
View File

@@ -0,0 +1,15 @@
{
"healthchecks": {
"web": [
{
"attempts": 2,
"content": "Hello World!",
"name": "check-1",
"path": "/",
"timeout": 5,
"type": "startup",
"wait": 2
}
]
}
}

5
tests/apps/dockerfile-procfile-bad/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ nodejs/express

15
tests/apps/dockerfile-procfile-bad/app.json Normal file
View File

@@ -0,0 +1,15 @@
{
"healthchecks": {
"web": [
{
"attempts": 2,
"content": "nodejs/express",
"name": "check-1",
"path": "/",
"timeout": 5,
"type": "startup",
"wait": 2
}
]
}
}

5
tests/apps/dockerfile-procfile/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ nodejs/express

19
tests/apps/dockerfile-procfile/app.json
View File

@@ -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"
}
}
}
}

5
tests/apps/dockerfile/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ Hello World!

57
tests/apps/dockerfile/app.json
View File

@@ -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/"
}

1
tests/apps/gitsubmodules/CHECKS
View File

@@ -1 +0,0 @@
/ Hello

12
tests/apps/gitsubmodules/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "Hello",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/go-fail-postdeploy/CHECKS
View File

@@ -1 +0,0 @@
/ go

34
tests/apps/go-fail-postdeploy/app.json
View File

@@ -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/"
}

1
tests/apps/go-fail-predeploy/CHECKS
View File

@@ -1 +0,0 @@
/ go

34
tests/apps/go-fail-predeploy/app.json
View File

@@ -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/"
}

1
tests/apps/go/CHECKS
View File

@@ -1 +0,0 @@
/ go

12
tests/apps/go/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "go",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/java/CHECKS
View File

@@ -1 +0,0 @@
/ Hello from Java

12
tests/apps/java/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "Hello from Java",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/multi/CHECKS
View File

@@ -1 +0,0 @@
/ Heroku Multi Buildpack on Dokku

12
tests/apps/multi/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "Heroku Multi Buildpack on Dokku",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

5
tests/apps/nodejs-express-noappjson/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ nodejs/express

15
tests/apps/nodejs-express-noappjson/app.json Normal file
View File

@@ -0,0 +1,15 @@
{
"healthchecks": {
"web": [
{
"attempts": 2,
"content": "nodejs/express",
"name": "check-1",
"path": "/",
"timeout": 5,
"type": "startup",
"wait": 2
}
]
}
}

1
tests/apps/nodejs-express-noprocfile/CHECKS
View File

@@ -1 +0,0 @@
/ nodejs/express

12
tests/apps/nodejs-express-noprocfile/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "nodejs/express",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

5
tests/apps/nodejs-express/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ nodejs/express

57
tests/apps/nodejs-express/app.json
View File

@@ -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/"
}

1
tests/apps/php/CHECKS
View File

@@ -1 +0,0 @@
/ <html><h3>php</h3></html>

12
tests/apps/php/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "\u003chtml\u003e\u003ch3\u003ephp\u003c/h3\u003e\u003c/html\u003e",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/python-flask/CHECKS
View File

@@ -1 +0,0 @@
/ python/flask

12
tests/apps/python-flask/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "python/flask",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

5
tests/apps/python/CHECKS
View File

@@ -1,5 +0,0 @@
WAIT=2 # wait 2 seconds
TIMEOUT=5 # set timeout to 5 seconds
ATTEMPTS=2 # try 2 times
/ python/http.server

19
tests/apps/python/app.json
View File

@@ -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"
}
}
}
}

1
tests/apps/ruby/CHECKS
View File

@@ -1 +0,0 @@
/ Hello, world

12
tests/apps/ruby/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "Hello, world",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/static/CHECKS
View File

@@ -1 +0,0 @@
/ Static Page

12
tests/apps/static/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "Static Page",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/zombies-buildpack/CHECKS
View File

@@ -1 +0,0 @@
/ go

12
tests/apps/zombies-buildpack/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "go",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/zombies-dockerfile-no-tini/CHECKS
View File

@@ -1 +0,0 @@
/ go

12
tests/apps/zombies-dockerfile-no-tini/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "go",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}

1
tests/apps/zombies-dockerfile-tini/CHECKS
View File

@@ -1 +0,0 @@
/ go

12
tests/apps/zombies-dockerfile-tini/app.json Normal file
View File

@@ -0,0 +1,12 @@
{
"healthchecks": {
"web": [
{
"content": "go",
"name": "check-1",
"path": "/",
"type": "startup"
}
]
}
}