From 0793cb61671ed7d5d0f7fed8bdbbb7e8dc659fca Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 26 Jul 2019 20:31:45 -0400
Subject: [PATCH] healthcheck for attachments server

---
 util/Attachments/Dockerfile | 5 ++++-
 util/Server/Startup.cs      | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/util/Attachments/Dockerfile b/util/Attachments/Dockerfile
index a0e897ea66..8ea2638098 100644
--- a/util/Attachments/Dockerfile
+++ b/util/Attachments/Dockerfile
@@ -5,11 +5,14 @@ LABEL com.bitwarden.product="bitwarden"
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         gosu \
-&& rm -rf /var/lib/apt/lists/*
+        curl \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV ASPNETCORE_URLS http://+:5000
 EXPOSE 5000
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
+HEALTHCHECK CMD curl -f http://localhost:5000/alive || exit 1
+
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/util/Server/Startup.cs b/util/Server/Startup.cs
index a8bd14048f..c27ce1ec24 100644
--- a/util/Server/Startup.cs
+++ b/util/Server/Startup.cs
@@ -33,6 +33,7 @@ namespace Bit.Server
         {
             if(configuration.GetValue<bool?>("serveUnknown") ?? false)
             {
+                app.Map("/alive", HandleMapAlive);
                 app.UseStaticFiles(new StaticFileOptions
                 {
                     ServeUnknownFileTypes = true,
@@ -70,8 +71,14 @@ namespace Bit.Server
             }
             else
             {
+                app.Map("/alive", HandleMapAlive);
                 app.UseFileServer();
             }
         }
+
+        private static void HandleMapAlive(IApplicationBuilder app)
+        {
+            app.Run(async context => await context.Response.WriteAsync(System.DateTime.UtcNow.ToString()));
+        }
     }
 }