From 459a85f88113c594d5aa48656218798bb6eca506 Mon Sep 17 00:00:00 2001 From: Rick van Dam Date: Wed, 13 Nov 2024 21:30:43 +0100 Subject: [PATCH] update docker container files to net 9 --- .devcontainer/Dockerfile | 2 +- Dockerfile | 4 ++-- Dockerfile.AddOn | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e4d531556..a8165451c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 +FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim-amd64 RUN apt-get update && apt-get install -y ssh # This Dockerfile adds a non-root 'vscode' user with sudo access. However, for Linux, diff --git a/Dockerfile b/Dockerfile index 519ab7db2..5e8bc4a85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Pre-build .NET NetDaemon core project -FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 as netbuilder +FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim-amd64 as netbuilder #FROM mcr.microsoft.com/dotnet/sdk:8.0 as netbuilder ARG TARGETPLATFORM ARG BUILDPLATFORM @@ -14,7 +14,7 @@ COPY . /usr RUN dotnet publish /usr/src/Host/NetDaemon.Host.Default/NetDaemon.Host.Default.csproj -o "/daemon" # Final stage, create the runtime container -FROM ghcr.io/net-daemon/netdaemon_base:8 +FROM ghcr.io/net-daemon/netdaemon_base:9 # # Install S6 and the Admin site # COPY ./Docker/rootfs/etc/services.d/NetDaemonAdmin /etc/services.d/NetDaemonAdmin diff --git a/Dockerfile.AddOn b/Dockerfile.AddOn index e4b599b22..fb700f9f5 100644 --- a/Dockerfile.AddOn +++ b/Dockerfile.AddOn @@ -1,6 +1,6 @@ # No admin support yet, we need to build the websocket API # Pre-build .NET NetDaemon core project -FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 as netbuilder +FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim-amd64 as netbuilder ARG TARGETPLATFORM ARG BUILDPLATFORM @@ -14,7 +14,7 @@ COPY . /usr RUN dotnet publish /usr/src/Host/NetDaemon.Host.Default/NetDaemon.Host.Default.csproj -o "/daemon" # Final stage, create the runtime container -FROM ghcr.io/net-daemon/netdaemon_addonbase:8 +FROM ghcr.io/net-daemon/netdaemon_addonbase:9 # # Install S6 and the Admin site COPY --chmod=755 ./Docker/rootfs/etc/services.d/netdaemon_addon /etc/s6-overlay/s6-rc.d/netdaemon_addon