From f78b212aa8878f07a954039b802ed765ad43417a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 26 Jul 2019 11:59:42 -0400 Subject: [PATCH] health checks for docker --- .editorconfig | 6 +++++- src/Admin/Dockerfile | 3 +++ src/Api/Dockerfile | 3 +++ src/Billing/Controllers/HomeController.cs | 8 ++++++++ src/Events/Controllers/CollectController.cs | 8 ++++++++ src/Events/Dockerfile | 3 +++ src/Icons/Dockerfile | 3 +++ src/Identity/Dockerfile | 3 +++ src/Notifications/Controllers/SendController.cs | 11 ++++++++++- src/Notifications/Dockerfile | 3 +++ 10 files changed, 49 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 118b6e64a6..1fbf4e5d86 100644 --- a/.editorconfig +++ b/.editorconfig @@ -105,4 +105,8 @@ csharp_new_line_before_else = true csharp_new_line_before_catch = true csharp_new_line_before_finally = true csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true \ No newline at end of file +csharp_new_line_before_members_in_anonymous_types = true + +# All files +[*] +guidelines = 120 diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile index e44b837351..e11c278162 100644 --- a/src/Admin/Dockerfile +++ b/src/Admin/Dockerfile @@ -5,6 +5,7 @@ LABEL com.bitwarden.product="bitwarden" RUN apt-get update \ && apt-get install -y --no-install-recommends \ gosu \ + curl \ libcurl3 \ && rm -rf /var/lib/apt/lists/* @@ -15,4 +16,6 @@ COPY obj/Docker/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh +HEALTHCHECK CMD curl -f http://localhost:5000 || exit 1 + ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile index bcd3c8ca26..f5ceb37400 100644 --- a/src/Api/Dockerfile +++ b/src/Api/Dockerfile @@ -5,6 +5,7 @@ LABEL com.bitwarden.product="bitwarden" RUN apt-get update \ && apt-get install -y --no-install-recommends \ gosu \ + curl \ libcurl3 \ && rm -rf /var/lib/apt/lists/* @@ -15,4 +16,6 @@ COPY obj/Docker/publish/Api . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh +HEALTHCHECK CMD curl -f http://localhost:5000/alive || exit 1 + ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/Billing/Controllers/HomeController.cs b/src/Billing/Controllers/HomeController.cs index 00f5bc4c20..e4e9918196 100644 --- a/src/Billing/Controllers/HomeController.cs +++ b/src/Billing/Controllers/HomeController.cs @@ -6,6 +6,14 @@ namespace Billing.Controllers { public class HomeController : Controller { + [HttpGet("~/alive")] + [HttpGet("~/now")] + [AllowAnonymous] + public DateTime GetAlive() + { + return DateTime.UtcNow; + } + /* [Authorize] public IActionResult Index() diff --git a/src/Events/Controllers/CollectController.cs b/src/Events/Controllers/CollectController.cs index 06ceaaaa80..889e3ae1ed 100644 --- a/src/Events/Controllers/CollectController.cs +++ b/src/Events/Controllers/CollectController.cs @@ -32,6 +32,14 @@ namespace Bit.Events.Controllers _cipherRepository = cipherRepository; } + [HttpGet("~/alive")] + [HttpGet("~/now")] + [AllowAnonymous] + public DateTime GetAlive() + { + return DateTime.UtcNow; + } + [HttpPost] public async Task Post([FromBody]IEnumerable model) { diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile index cd33466615..055b362333 100644 --- a/src/Events/Dockerfile +++ b/src/Events/Dockerfile @@ -5,6 +5,7 @@ LABEL com.bitwarden.product="bitwarden" RUN apt-get update \ && apt-get install -y --no-install-recommends \ gosu \ + curl \ libcurl3 \ && rm -rf /var/lib/apt/lists/* @@ -15,4 +16,6 @@ COPY obj/Docker/publish/Events . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh +HEALTHCHECK CMD curl -f http://localhost:5000/alive || exit 1 + ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile index 5cb5b6a27a..7e7235cb0a 100644 --- a/src/Icons/Dockerfile +++ b/src/Icons/Dockerfile @@ -5,6 +5,7 @@ LABEL com.bitwarden.product="bitwarden" RUN apt-get update \ && apt-get install -y --no-install-recommends \ gosu \ + curl \ && rm -rf /var/lib/apt/lists/* ENV ASPNETCORE_URLS http://+:5000 @@ -14,4 +15,6 @@ COPY obj/Docker/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh +HEALTHCHECK CMD curl -f http://localhost:5000/google.com/icon.png || exit 1 + ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile index e44b837351..06d255f6a6 100644 --- a/src/Identity/Dockerfile +++ b/src/Identity/Dockerfile @@ -5,6 +5,7 @@ LABEL com.bitwarden.product="bitwarden" RUN apt-get update \ && apt-get install -y --no-install-recommends \ gosu \ + curl \ libcurl3 \ && rm -rf /var/lib/apt/lists/* @@ -15,4 +16,6 @@ COPY obj/Docker/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh +HEALTHCHECK CMD curl -f http://localhost:5000/.well-known/openid-configuration || exit 1 + ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/Notifications/Controllers/SendController.cs b/src/Notifications/Controllers/SendController.cs index 7a99c8f8ac..2b6149fd74 100644 --- a/src/Notifications/Controllers/SendController.cs +++ b/src/Notifications/Controllers/SendController.cs @@ -1,4 +1,5 @@ -using System.IO; +using System; +using System.IO; using System.Text; using System.Threading.Tasks; using Bit.Core.Utilities; @@ -19,6 +20,14 @@ namespace Bit.Notifications _hubContext = hubContext; } + [HttpGet("~/alive")] + [HttpGet("~/now")] + [AllowAnonymous] + public DateTime GetAlive() + { + return DateTime.UtcNow; + } + [HttpPost("~/send")] public async Task PostSend() { diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile index 5cb5b6a27a..60eb13d828 100644 --- a/src/Notifications/Dockerfile +++ b/src/Notifications/Dockerfile @@ -5,6 +5,7 @@ LABEL com.bitwarden.product="bitwarden" RUN apt-get update \ && apt-get install -y --no-install-recommends \ gosu \ + curl \ && rm -rf /var/lib/apt/lists/* ENV ASPNETCORE_URLS http://+:5000 @@ -14,4 +15,6 @@ COPY obj/Docker/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh +HEALTHCHECK CMD curl -f http://localhost:5000/alive || exit 1 + ENTRYPOINT ["/entrypoint.sh"]