From 774a4bb26738c764d293b4a4e9699f94c0a4096e Mon Sep 17 00:00:00 2001 From: Richard Morgan Date: Mon, 29 Oct 2018 22:17:06 -0400 Subject: [PATCH] update sslproxy deployment to include health check and Jenkinsfile that builds docker image fixed metrics.xai-corp.net host file --- dockerfiles/services/sslproxy/deploy.sh | 2 +- .../services/sslproxy/docker-compose-prod.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dockerfiles/services/sslproxy/deploy.sh b/dockerfiles/services/sslproxy/deploy.sh index 74901be..ae9bf7b 100644 --- a/dockerfiles/services/sslproxy/deploy.sh +++ b/dockerfiles/services/sslproxy/deploy.sh @@ -6,4 +6,4 @@ docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy -docker service update sslproxy +docker service update -q sslproxy_app diff --git a/dockerfiles/services/sslproxy/docker-compose-prod.yml b/dockerfiles/services/sslproxy/docker-compose-prod.yml index 9114f2e..2a2a801 100644 --- a/dockerfiles/services/sslproxy/docker-compose-prod.yml +++ b/dockerfiles/services/sslproxy/docker-compose-prod.yml @@ -19,12 +19,12 @@ services: - "443:443" - "80:80" # required for letsencrypt -# healthcheck: -# test: ["CMD", "wget", "--spider", "--header", "'Host: git.xai-corp.net'", "https://localhost/"] -# interval: 1m30s -# timeout: 10s -# retries: 3 -# start_period: 3m + healthcheck: + test: ["CMD", "wget", "--spider", "--header", "'Host: dkui.xai-corp.net'", "https://localhost/"] + interval: 1m30s + timeout: 5s + retries: 3 + start_period: 10s logging: driver: fluentd