File tree Expand file tree Collapse file tree 5 files changed +25
-15
lines changed
frameworks/CSharp/appmpower Expand file tree Collapse file tree 5 files changed +25
-15
lines changed Original file line number Diff line number Diff line change 1
- FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
1
+ FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
2
2
RUN apt-get update
3
3
RUN apt-get -yqq install clang zlib1g-dev
4
4
RUN apt-get update
@@ -8,7 +8,7 @@ COPY src .
8
8
RUN dotnet publish -c Release -o out /p:Database=mysql
9
9
10
10
# Construct the actual image that will run
11
- FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
11
+ FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
12
12
13
13
RUN apt-get update
14
14
# The following installs standard versions unixodbc and pgsqlodbc
@@ -18,6 +18,7 @@ RUN apt-get update
18
18
19
19
WORKDIR /odbc
20
20
21
+ # TODOGITHUB
21
22
RUN curl -L -o mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz https://downloads.mariadb.com/Connectors/odbc/connector-odbc-3.1.20/mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
22
23
RUN tar -xvzf mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
23
24
RUN cp mariadb-connector-odbc-3.1.20-debian-bookworm-amd64/lib/mariadb/libm* /usr/lib/
@@ -45,8 +46,10 @@ WORKDIR /app
45
46
COPY --from=build /app/out ./
46
47
47
48
RUN cp /usr/lib/libm* /app
48
- # RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
49
+ # TODOGITHUB
49
50
RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
51
+ # TODOLOCAL
52
+ # RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
50
53
51
54
EXPOSE 8080
52
55
Original file line number Diff line number Diff line change 1
- FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
1
+ FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
2
2
RUN apt-get update
3
- RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
3
+ RUN apt-get -yqq install clang zlib1g-dev
4
4
5
5
WORKDIR /app
6
6
COPY src .
7
7
RUN dotnet publish -c Release -o out /p:Database=postgresql
8
8
9
9
# Construct the actual image that will run
10
- FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
10
+ FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
11
11
12
12
RUN apt-get update
13
13
RUN apt-get install -y unixodbc-dev unixodbc odbc-postgresql
@@ -27,9 +27,10 @@ ENV ASPNETCORE_URLS http://+:8080
27
27
WORKDIR /app
28
28
COPY --from=build /app/out ./
29
29
30
- # RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
30
+ # TODOGITHUB
31
31
RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
32
-
32
+ # TODOLOCAL
33
+ # RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
33
34
34
35
EXPOSE 8080
35
36
Original file line number Diff line number Diff line change 1
- FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
1
+ FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
2
2
RUN apt-get update
3
- RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
3
+ RUN apt-get -yqq install clang zlib1g-dev
4
4
5
5
WORKDIR /app
6
6
COPY src .
7
7
# RUN dotnet publish appMpower/appMpower.csproj -c Release -o out
8
8
RUN dotnet publish -c Release -o out
9
9
10
10
# Construct the actual image that will run
11
- FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
11
+ FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
12
12
# Full PGO
13
13
ENV DOTNET_TieredPGO 1
14
14
ENV DOTNET_TC_QuickJitForLoops 1
Original file line number Diff line number Diff line change 8
8
<SelfContained >true</SelfContained >
9
9
<AllowUnsafeBlocks >true</AllowUnsafeBlocks >
10
10
11
+ <!-- TODOGITHUB-->
11
12
<RuntimeIdentifier >linux-x64</RuntimeIdentifier > <!-- docker server -->
12
13
<!-- TODOLOCAL-->
13
14
<!-- <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>--> <!-- docker local -->
36
37
</PropertyGroup >
37
38
38
39
<ItemGroup >
39
- <PackageReference Include =" System.Data.Odbc" Version =" 9.0.0" />
40
+ <RuntimeHostConfigurationOption Include =" System.Threading.ThreadPool.HillClimbing.Disable" Value =" true" />
41
+ </ItemGroup >
42
+
43
+ <ItemGroup >
44
+ <PackageReference Include =" System.Data.Odbc" Version =" 9.0.6" />
40
45
</ItemGroup >
41
46
42
47
</Project >
Original file line number Diff line number Diff line change 9
9
<ItemGroup >
10
10
<None Include =" appsettings.json" CopyToOutputDirectory =" PreserveNewest" />
11
11
12
+ <!-- TODOLOCAL-->
12
13
<!--
13
- <Content Include="../appMpower.Orm/bin/Release/net8 .0/appMpower.Orm.dll">
14
+ <Content Include="../appMpower.Orm/bin/Release/net9 .0/appMpower.Orm.dll">
14
15
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
15
16
</Content>
16
17
-->
17
- <!-- TODOLOCAL-->
18
+ <!-- TODOLOCAL AOT -->
18
19
<!--
19
- <Content Include="../appMpower.Orm/bin/Release/net8 .0/osx-arm64/native/appMpower.Orm.dylib">
20
+ <Content Include="../appMpower.Orm/bin/Release/net9 .0/osx-arm64/native/appMpower.Orm.dylib">
20
21
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21
22
</Content>
22
23
-->
You can’t perform that action at this time.
0 commit comments