Merge pull request #59 from qJake/project-updates

Dockerfile updates
qJake · Feb 8, 2020 · 7775164 · 7775164
2 parents c7f453f + 866d9fc
commit 7775164
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 14 deletions.
diff --git a/Docker/BuildHaccContainers.ps1 b/Docker/BuildHaccContainers.ps1
@@ -1,4 +1,4 @@
-$version = '1.0.0'
+$version = '1.0.1'
 
 function Test-ExitCode ([int] $Expected = 0)
 {

diff --git a/Docker/linux-alpine-amd64/Dockerfile b/Docker/linux-alpine-amd64/Dockerfile
@@ -46,3 +46,19 @@ ENV HACC_VERSION $TAG
 EXPOSE 8095
 
 ENTRYPOINT ["dotnet", "HADotNet.CommandCenter.dll"]
+
+# Labels
+LABEL \
+    io.hass.name="HACC" \
+    io.hass.description="Wall-mountable tablet interface for Home Assistant." \
+    io.hass.arch="amd64" \
+    io.hass.type="addon" \
+    io.hass.version=${HACC_VERSION} \
+    maintainer="qJake <https://github.com/qJake/>" \
+    org.label-schema.description="Wall-mountable tablet interface for Home Assistant." \
+    org.label-schema.name="HACC" \
+    org.label-schema.schema-version="1.0" \    
+    org.label-schema.url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.usage="https://github.com/qJake/HADotNet.CommandCenter/README.md" \
+    org.label-schema.vcs-url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.vendor="qJake"
diff --git a/Docker/linux-debian-amd64/Dockerfile b/Docker/linux-debian-amd64/Dockerfile
@@ -46,3 +46,19 @@ ENV HACC_VERSION $TAG
 EXPOSE 8095
 
 ENTRYPOINT ["dotnet", "HADotNet.CommandCenter.dll"]
+
+# Labels
+LABEL \
+    io.hass.name="HACC" \
+    io.hass.description="Wall-mountable tablet interface for Home Assistant." \
+    io.hass.arch="amd64" \
+    io.hass.type="addon" \
+    io.hass.version=${HACC_VERSION} \
+    maintainer="qJake <https://github.com/qJake/>" \
+    org.label-schema.description="Wall-mountable tablet interface for Home Assistant." \
+    org.label-schema.name="HACC" \
+    org.label-schema.schema-version="1.0" \    
+    org.label-schema.url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.usage="https://github.com/qJake/HADotNet.CommandCenter/README.md" \
+    org.label-schema.vcs-url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.vendor="qJake"
diff --git a/Docker/linux-debian-arm32v7/Dockerfile b/Docker/linux-debian-arm32v7/Dockerfile
@@ -24,25 +24,18 @@ WORKDIR /app
 
 CMD ["dotnet", "HADotNet.CommandCenter.dll"]
 
-# Build arguments
-ARG BUILD_DATE
-ARG BUILD_REF
-ARG BUILD_VERSION
-
 # Labels
 LABEL \
     io.hass.name="HACC" \
     io.hass.description="Wall-mountable tablet interface for Home Assistant." \
-    io.hass.arch="armv7|armhf|i386|amd64" \
+    io.hass.arch="armhf" \
     io.hass.type="addon" \
-    io.hass.version=${BUILD_VERSION} \
+    io.hass.version=${HACC_VERSION} \
     maintainer="qJake <https://github.com/qJake/>" \
     org.label-schema.description="Wall-mountable tablet interface for Home Assistant." \
-    org.label-schema.build-date=${BUILD_DATE} \
     org.label-schema.name="HACC" \
-    org.label-schema.schema-version="$TAG" \
+    org.label-schema.schema-version="1.0" \    
     org.label-schema.url="https://github.com/qJake/HADotNet.CommandCenter/" \
     org.label-schema.usage="https://github.com/qJake/HADotNet.CommandCenter/README.md" \
-    org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/qJake/HADotNet.CommandCenter/" \
     org.label-schema.vendor="qJake"
diff --git a/Docker/linux-debian-arm64v8/Dockerfile b/Docker/linux-debian-arm64v8/Dockerfile
@@ -52,3 +52,19 @@ ENV HACC_VERSION $TAG
 EXPOSE 8095
 
 ENTRYPOINT ["dotnet", "HADotNet.CommandCenter.dll"]
+
+# Labels
+LABEL \
+    io.hass.name="HACC" \
+    io.hass.description="Wall-mountable tablet interface for Home Assistant." \
+    io.hass.arch="aarch64" \
+    io.hass.type="addon" \
+    io.hass.version=${HACC_VERSION} \
+    maintainer="qJake <https://github.com/qJake/>" \
+    org.label-schema.description="Wall-mountable tablet interface for Home Assistant." \
+    org.label-schema.name="HACC" \
+    org.label-schema.schema-version="1.0" \    
+    org.label-schema.url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.usage="https://github.com/qJake/HADotNet.CommandCenter/README.md" \
+    org.label-schema.vcs-url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.vendor="qJake"
diff --git a/Docker/linux-ubuntu-amd64/Dockerfile b/Docker/linux-ubuntu-amd64/Dockerfile
@@ -46,3 +46,21 @@ ENV HACC_VERSION $TAG
 EXPOSE 8095
 
 ENTRYPOINT ["dotnet", "HADotNet.CommandCenter.dll"]
+
+# Labels
+LABEL \
+    io.hass.name="HACC" \
+    io.hass.description="Wall-mountable tablet interface for Home Assistant." \
+    io.hass.arch="amd64" \
+    io.hass.type="addon" \
+    io.hass.version=${BUILD_VERSION} \
+    maintainer="qJake <https://github.com/qJake/>" \
+    org.label-schema.description="Wall-mountable tablet interface for Home Assistant." \
+    org.label-schema.build-date=${BUILD_DATE} \
+    org.label-schema.name="HACC" \
+    org.label-schema.schema-version="$TAG" \
+    org.label-schema.url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.usage="https://github.com/qJake/HADotNet.CommandCenter/README.md" \
+    org.label-schema.vcs-ref=${BUILD_REF} \
+    org.label-schema.vcs-url="https://github.com/qJake/HADotNet.CommandCenter/" \
+    org.label-schema.vendor="qJake"
diff --git a/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj b/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj
@@ -5,8 +5,8 @@
     <RuntimeIdentifiers>win10;alpine.3.10-x64;debian.10-arm</RuntimeIdentifiers>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Deterministic>false</Deterministic>

diff --git a/HADotNet.CommandCenter/Program.cs b/HADotNet.CommandCenter/Program.cs
@@ -14,6 +14,8 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(wb =>
                 {
+                    wb.ConfigureKestrel(k => k.AddServerHeader = false);
+                    wb.CaptureStartupErrors(true);
                     wb.UseStartup<Startup>();
                 });
     }

diff --git a/HADotNet.CommandCenter/Startup.cs b/HADotNet.CommandCenter/Startup.cs
@@ -76,7 +76,14 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSignalR()
                     .AddNewtonsoftJsonProtocol();
 
-            services.AddControllersWithViews().AddRazorRuntimeCompilation();
+            if (Environment.IsDevelopment())
+            {
+                services.AddControllersWithViews().AddRazorRuntimeCompilation();
+            }
+            else
+            {
+                services.AddControllersWithViews();
+            }
 
             services.AddMvc()
                     .AddNewtonsoftJson();