fix: missing aspnet runtime

chgl · Mar 20, 2021 · 8d57135 · 8d57135
1 parent 64c64a4
commit 8d57135
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ FROM build AS test
 WORKDIR /build/src/FhirServerExporter.Tests
 RUN dotnet test -p:CollectCoverage=true
 
-FROM mcr.microsoft.com/dotnet/runtime:5.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine
 WORKDIR /opt/fhir-server-exporter
 COPY --from=build /build/publish .
 

diff --git a/src/FhirServerExporter/Program.cs b/src/FhirServerExporter/Program.cs
@@ -19,20 +19,22 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
             services.AddHostedService<FhirExporter>();
 
             var config = ctx.Configuration;
-            var oAuthUri = config.GetValue<Uri>("Auth:OAuth:TokenUrl");
-            if (oAuthUri != null)
+            services.AddAccessTokenManagement(options =>
             {
-                services.AddAccessTokenManagement(options =>
+                var oauthUri = config.GetValue<Uri>("Auth:OAuth:TokenUrl")?.AbsoluteUri;
+                if (oauthUri == null)
                 {
-                    options.Client.Clients.Add("default", new()
-                    {
-                        Address = oAuthUri.AbsoluteUri,
-                        ClientId = config.GetValue<string>("Auth:OAuth:ClientId"),
-                        ClientSecret = config.GetValue<string>("Auth:OAuth:ClientSecret"),
-                        Scope = config.GetValue<string>("Auth:OAuth:Scope"),
-                    });
+                    return;
+                }
+
+                options.Client.Clients.Add("default", new()
+                {
+                    Address = oauthUri,
+                    ClientId = config.GetValue<string>("Auth:OAuth:ClientId"),
+                    ClientSecret = config.GetValue<string>("Auth:OAuth:ClientSecret"),
+                    Scope = config.GetValue<string>("Auth:OAuth:Scope"),
                 });
-            }
+            });
         })
         .ConfigureLogging(builder =>
             builder.AddSimpleConsole(options =>