Merge branch 'dev' into dependabot/nuget/YamlDotNet-10.1.0

net-daemon · Apr 1, 2021 · f30aa26 · f30aa26
2 parents 9584e55 + 6210480
commit f30aa26
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/push_docker_dev.yml b/.github/workflows/push_docker_dev.yml
@@ -15,6 +15,7 @@ jobs:
       - name: 📆 Set version number
         run: |
           sed -i '/        private const string Version = /c\        private const string Version =  "dev build";' ${{github.workspace}}/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
+          sed -i '/    io.hass.version=/c\    io.hass.version="dev" \\' ${{github.workspace}}/Dockerfile
       -
         name: 📎 Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/tags_docker.yml b/.github/workflows/tags_docker.yml
@@ -33,6 +33,8 @@ jobs:
       - name: 📆 Set version number
         run: |
           sed -i "/        private const string Version = /c\        private const string Version =  \"${{ steps.version.outputs.version }}\";" ${{github.workspace}}/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
+          sed -i '/    io.hass.version=/c\    io.hass.version="${{ steps.version.outputs.version }}" \\' ${{github.workspace}}/Dockerfile
+
       -
         name: 📎 Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/Dockerfile b/Dockerfile
@@ -61,4 +61,8 @@ ENV \
     NETDAEMON__ADMIN=true \
     ASPNETCORE_URLS=http://+:5000 
 
+LABEL \
+    io.hass.version="VERSION" \
+    io.hass.type="addon" \
+    io.hass.arch="armhf|aarch64|amd64"
 ENTRYPOINT ["/init"] 
diff --git a/src/App/NetDaemon.App/NetDaemon.App.csproj b/src/App/NetDaemon.App/NetDaemon.App.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="21.05.0-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="21.13.0-beta" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Roslynator.Analyzers" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj b/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj
@@ -20,7 +20,7 @@
     <tags>Home Assistant</tags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="21.5.0-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="21.13.0-beta" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="YamlDotNet" Version="10.1.0" />

diff --git a/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj b/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="21.05.0-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="21.13.0-beta" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />