From dff5a76e9ee1de6076deff42a0dfdbf2d284dce9 Mon Sep 17 00:00:00 2001 From: Diego <2248356998@qq.com> Date: Wed, 27 Nov 2024 16:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0docker=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Directory.Build.props | 6 +++--- src/FoundationVersion.props | 2 +- src/ThingsGateway.Server/Dockerfile | 2 +- src/ThingsGateway.Server/Dockerfile_arm64 | 2 +- src/Version.props | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7d0b9905f..e5ad67813 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@ - 7.2.0.23 - 9.0.2.18 - 9.0.2.46 + 7.2.0.24 + 9.0.2.19 + 9.0.2.47 diff --git a/src/FoundationVersion.props b/src/FoundationVersion.props index 213b78643..ec8051e54 100644 --- a/src/FoundationVersion.props +++ b/src/FoundationVersion.props @@ -1,6 +1,6 @@ - 9.0.2.14 + 9.0.2.15 diff --git a/src/ThingsGateway.Server/Dockerfile b/src/ThingsGateway.Server/Dockerfile index 6518296c3..8a588da9d 100644 --- a/src/ThingsGateway.Server/Dockerfile +++ b/src/ThingsGateway.Server/Dockerfile @@ -5,7 +5,7 @@ #推送:docker push registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway #aspnetcore9.0环境 -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble AS base COPY . /app WORKDIR /app #默认web diff --git a/src/ThingsGateway.Server/Dockerfile_arm64 b/src/ThingsGateway.Server/Dockerfile_arm64 index 859a0f488..0ee0d1673 100644 --- a/src/ThingsGateway.Server/Dockerfile_arm64 +++ b/src/ThingsGateway.Server/Dockerfile_arm64 @@ -5,7 +5,7 @@ #推送:docker push registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64 #aspnetcore9.0环境 -FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine-arm64v8 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-arm64v8 AS base COPY . /app WORKDIR /app #默认web diff --git a/src/Version.props b/src/Version.props index 87724b248..84b340cd5 100644 --- a/src/Version.props +++ b/src/Version.props @@ -1,6 +1,6 @@ - 7.2.0.31 + 7.2.0.32