Skip to content

Commit 12c3f90

Browse files
committed
升级为 net10
1 parent b9b4a81 commit 12c3f90

37 files changed

Lines changed: 198 additions & 513 deletions

.github/workflows/docker-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
- name: Login docker regsitry
1818
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_USER_PASSWORD }}
1919
- name: Build the Docker image
20-
run: docker build --target zserver-api -f API.Dockerfile -t zlzforever/zserver-api:202508-2 .
20+
run: docker build --target zserver-api -f API.Dockerfile -t zlzforever/zserver-api:20251201-1 .
2121
- name: Publish the Docker image
22-
run: docker push zlzforever/zserver-api:202508-2
22+
run: docker push zlzforever/zserver-api:20251201-1

API.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS api-builder
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS api-builder
22
WORKDIR /app
33
COPY . .
44
RUN cd src/ZServer.API && dotnet publish -c Release -o out
@@ -13,9 +13,9 @@ RUN rm -rf src/ZServer.API/out/runtimes/win-arm64
1313
RUN rm -rf src/ZServer.API/out/runtimes/win-x64
1414
RUN rm -rf src/ZServer.API/out/runtimes/win-x86
1515
RUN rm -rf src/ZServer.API/out/shapes
16-
RUN rm -rf src/ZServer.API/out/Fonts
16+
RUN rm -rf src/ZServer.API/out/fonts
1717

18-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS zserver-api
18+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS zserver-api
1919
WORKDIR /app
2020
EXPOSE 8200
2121
ENV LANG zh_CN.UTF-8

API_ARM.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:7.0-focal-arm64v8 AS api-builder
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0-focal-arm64v8 AS api-builder
22
WORKDIR /app
33
COPY . .
44
RUN cd src/ZServer.API && dotnet restore
@@ -14,7 +14,7 @@ RUN rm -rf src/ZServer.API/out/runtimes/linux-x64
1414
RUN rm -rf src/ZServer.API/out/shapes
1515
RUN rm -rf src/ZServer.API/out/Fonts
1616

17-
FROM mcr.microsoft.com/dotnet/aspnet:7.0-focal-arm64v8 AS zserver-api
17+
FROM mcr.microsoft.com/dotnet/aspnet:10.0-focal-arm64v8 AS zserver-api
1818
WORKDIR /app
1919
#RUN sed -i "s@http://deb.debian.org@http://mirrors.aliyun.com@g" /etc/apt/sources.list
2020
#RUN apt-get update -y && apt-get install -y libgdiplus locales fontconfig && apt-get clean && ln -s /usr/lib/libgdiplus.so /usr/lib/gdiplus.dll

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS api-builder
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS api-builder
22
WORKDIR /app
33
COPY . .
44
RUN sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
@@ -17,7 +17,7 @@ RUN rm -rf src/ZServer.API/out/shapes
1717
RUN rm -rf src/ZServer.API/out/Fonts
1818
RUN rm -rf src/ZServer.API/out/conf/appsettings.json
1919

20-
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS zserver
20+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS zserver
2121
ENV LANG C.UTF-8
2222
WORKDIR /app
2323
COPY --from=api-builder /app/src/ZServer.API/out .

ZServer.sln

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ ProjectSection(SolutionItems) = preProject
2727
publish.sh = publish.sh
2828
publish_x86.sh = publish_x86.sh
2929
publish_x86_api.sh = publish_x86_api.sh
30-
docker-compose.yml = docker-compose.yml
3130
start.sh = start.sh
3231
nuget.config = nuget.config
33-
roadmap1.md = roadmap1.md
3432
readme.md = readme.md
35-
workitems.md = workitems.md
3633
references.md = references.md
3734
maxboxstyle.json = maxboxstyle.json
3835
package.props = package.props
@@ -41,6 +38,7 @@ ProjectSection(SolutionItems) = preProject
4138
version.props = version.props
4239
docker-entrypoint.sh = docker-entrypoint.sh
4340
ci.yml = .github/workflows/docker-image.yml
41+
design.md = design.md
4442
EndProjectSection
4543
EndProject
4644
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZServer.API", "src\ZServer.API\ZServer.API.csproj", "{C2B0CB75-1C1B-4541-BCCA-E7071342C2C8}"

design.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# ZServer 设计思路
2+
3+
## 地图瓦片与 Actor 模型的天然契合
4+
5+
我需要设计一个地图的 WEB 服务,支持 OGC 的 WMS 和 WMTS 两种接口。
6+
对于 WMTS 其瓦片的唯一性天然和 Actor 模型契合, 因此可以很方便的管理每一个瓦片的更新、渲染, 而不用担心并发锁的问题
7+
对于 WMS 也可以使用多个 Actor (根据负载、集群数据) 来做水平的扩容
8+
9+
请帮我整理一下设计思路。

docker-compose.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

package.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>zmap lab;</Authors>
77
<Copyright>Copyright 2023 zmap lab</Copyright>

0 commit comments

Comments
 (0)