diff --git a/build-docker-image.ps1 b/build-docker-image.ps1 index a0fe8a4cdd..870d4445d0 100644 --- a/build-docker-image.ps1 +++ b/build-docker-image.ps1 @@ -19,7 +19,7 @@ function Exec #Select the UI version from dependencies.props and use it as image version -$version = select-xml -Path ${PSScriptRoot}/build/dependencies.props -XPath "/Project/PropertyGroup[contains(@Label,'Health Checks Package Versions')]/HealthCheckUI" +$version = select-xml -Path ${PSScriptRoot}/build/versions.props -XPath "/Project/PropertyGroup[contains(@Label,'Health Checks Package Versions')]/HealthCheckUI" $tag = $version.node.InnerXML diff --git a/build-operator-image.ps1 b/build-operator-image.ps1 index b151c702f6..c9fd7fae80 100644 --- a/build-operator-image.ps1 +++ b/build-operator-image.ps1 @@ -18,7 +18,7 @@ function Exec { #Select the UI version from dependencies.props and use it as image version -$version = select-xml -Path .\build\dependencies.props -XPath "/Project/PropertyGroup[contains(@Label,'Health Checks Package Versions')]/HealthChecksUIK8sOperator" +$version = select-xml -Path .\build\versions.props -XPath "/Project/PropertyGroup[contains(@Label,'Health Checks Package Versions')]/HealthChecksUIK8sOperator" $tag = $version.node.InnerXML diff --git a/build/docker-images/HealthChecks.UI.Image/Dockerfile b/build/docker-images/HealthChecks.UI.Image/Dockerfile index 9f2b01e4b8..3f250ad0f2 100644 --- a/build/docker-images/HealthChecks.UI.Image/Dockerfile +++ b/build/docker-images/HealthChecks.UI.Image/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS sdk-with-node +FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS sdk-with-node ENV NODE_VERSION 18.16.0 ENV NODE_DOWNLOAD_SHA fc83046a93d2189d919005a348db3b2372b598a145d84eb9781a3a4b0f032e95