From 8a6b5927ddebc4382b88b4a69f615acb171631fa Mon Sep 17 00:00:00 2001 From: sanjusss Date: Tue, 25 Jan 2022 15:48:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=B0.net6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/Dockerfile | 2 +- aliyun-ddns.sln | 5 +- aliyun-ddns/Dockerfile | 4 +- aliyun-ddns/aliyun-ddns.csproj | 89 ++-------------------------------- 4 files changed, 11 insertions(+), 89 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index d7055a4..69ffda0 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -1,5 +1,5 @@ -FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS final +FROM mcr.microsoft.com/dotnet/core/runtime:6.0 AS final LABEL maintainer="sanjusss@qq.com" ENV AKID="access key id" ENV AKSCT="access key secret" diff --git a/aliyun-ddns.sln b/aliyun-ddns.sln index 91a7cec..182ff4d 100644 --- a/aliyun-ddns.sln +++ b/aliyun-ddns.sln @@ -1,12 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30204.135 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32112.339 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aliyun-ddns", "aliyun-ddns\aliyun-ddns.csproj", "{E25AF90B-C12B-4A54-94FB-329F486FBD65}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4B571F9E-C2B5-4DC1-8580-AC782BEFAC43}" ProjectSection(SolutionItems) = preProject + .github\Dockerfile = .github\Dockerfile LICENSE = LICENSE ReadMe.md = ReadMe.md EndProjectSection diff --git a/aliyun-ddns/Dockerfile b/aliyun-ddns/Dockerfile index 338cdc3..d25d7db 100644 --- a/aliyun-ddns/Dockerfile +++ b/aliyun-ddns/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build MAINTAINER sanjusss WORKDIR /src COPY . /src RUN dotnet publish -c Release -o /app /src/aliyun-ddns/ -FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS final +FROM mcr.microsoft.com/dotnet/core/runtime:6.0 AS final MAINTAINER sanjusss WORKDIR /app COPY --from=build /app . diff --git a/aliyun-ddns/aliyun-ddns.csproj b/aliyun-ddns/aliyun-ddns.csproj index 5363282..28c326b 100644 --- a/aliyun-ddns/aliyun-ddns.csproj +++ b/aliyun-ddns/aliyun-ddns.csproj @@ -1,89 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Exe - netcoreapp3.1 + net6.0 aliyun_ddns - 0.2.7 + 0.2.8 sanjusss https://github.com/sanjusss/aliyun-ddns @@ -91,8 +12,8 @@ git false BSD - 0.2.7.0 - 0.2.7.0 + 0.2.8.0 + 0.2.8.0 Linux From d269c2b7550e68574ddfc3492c8dde6cef0a961e Mon Sep 17 00:00:00 2001 From: sanjusss Date: Tue, 25 Jan 2022 16:39:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AECI?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aliyun-ddns/aliyun-ddns.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliyun-ddns/aliyun-ddns.csproj b/aliyun-ddns/aliyun-ddns.csproj index 28c326b..760000e 100644 --- a/aliyun-ddns/aliyun-ddns.csproj +++ b/aliyun-ddns/aliyun-ddns.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net6.0 aliyun_ddns 0.2.8 sanjusss @@ -15,6 +15,7 @@ 0.2.8.0 0.2.8.0 Linux + 8 From 5889b1035936a5d0bf2857b575b942b6c6f4d622 Mon Sep 17 00:00:00 2001 From: sanjusss Date: Tue, 25 Jan 2022 16:50:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddockerfile=E7=9A=84runtim?= =?UTF-8?q?e=E9=95=9C=E5=83=8F=E9=94=99=E8=AF=AF=E3=80=82=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=98=BF=E9=87=8C=E4=BA=91SDK=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/Dockerfile | 2 +- aliyun-ddns/Dockerfile | 2 +- aliyun-ddns/aliyun-ddns.csproj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 69ffda0..efe4145 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -1,5 +1,5 @@ -FROM mcr.microsoft.com/dotnet/core/runtime:6.0 AS final +FROM mcr.microsoft.com/dotnet/runtime:6.0 AS final LABEL maintainer="sanjusss@qq.com" ENV AKID="access key id" ENV AKSCT="access key secret" diff --git a/aliyun-ddns/Dockerfile b/aliyun-ddns/Dockerfile index d25d7db..427bdf1 100644 --- a/aliyun-ddns/Dockerfile +++ b/aliyun-ddns/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /src COPY . /src RUN dotnet publish -c Release -o /app /src/aliyun-ddns/ -FROM mcr.microsoft.com/dotnet/core/runtime:6.0 AS final +FROM mcr.microsoft.com/dotnet/runtime:6.0 AS final MAINTAINER sanjusss WORKDIR /app COPY --from=build /app . diff --git a/aliyun-ddns/aliyun-ddns.csproj b/aliyun-ddns/aliyun-ddns.csproj index 760000e..e11ae89 100644 --- a/aliyun-ddns/aliyun-ddns.csproj +++ b/aliyun-ddns/aliyun-ddns.csproj @@ -19,11 +19,11 @@ - + - - - + + +