Skip to content

Commit a67aa28

Browse files
authored
Correction of appmpower-odbc-pg.dockerfile build and version upgrades (#9966)
* Build correction for appmpower-odbc-pg.dockerfile and upgraded versions * appmpower-odbc-pg.dockerfile correction --------- Co-authored-by: LLT21 <>
1 parent ce686f7 commit a67aa28

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
22
RUN apt-get update
33
RUN apt-get -yqq install clang zlib1g-dev
44
RUN apt-get update
@@ -8,7 +8,7 @@ COPY src .
88
RUN dotnet publish -c Release -o out /p:Database=mysql
99

1010
# 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
1212

1313
RUN apt-get update
1414
# The following installs standard versions unixodbc and pgsqlodbc
@@ -18,6 +18,7 @@ RUN apt-get update
1818

1919
WORKDIR /odbc
2020

21+
#TODOGITHUB
2122
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
2223
RUN tar -xvzf mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
2324
RUN cp mariadb-connector-odbc-3.1.20-debian-bookworm-amd64/lib/mariadb/libm* /usr/lib/
@@ -45,8 +46,10 @@ WORKDIR /app
4546
COPY --from=build /app/out ./
4647

4748
RUN cp /usr/lib/libm* /app
48-
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
49+
#TODOGITHUB
4950
RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
51+
#TODOLOCAL
52+
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
5053

5154
EXPOSE 8080
5255

frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
22
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
44

55
WORKDIR /app
66
COPY src .
77
RUN dotnet publish -c Release -o out /p:Database=postgresql
88

99
# 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
1111

1212
RUN apt-get update
1313
RUN apt-get install -y unixodbc-dev unixodbc odbc-postgresql
@@ -27,9 +27,10 @@ ENV ASPNETCORE_URLS http://+:8080
2727
WORKDIR /app
2828
COPY --from=build /app/out ./
2929

30-
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
30+
#TODOGITHUB
3131
RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
32-
32+
#TODOLOCAL
33+
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
3334

3435
EXPOSE 8080
3536

frameworks/CSharp/appmpower/appmpower.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
22
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
44

55
WORKDIR /app
66
COPY src .
77
#RUN dotnet publish appMpower/appMpower.csproj -c Release -o out
88
RUN dotnet publish -c Release -o out
99

1010
# 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
1212
# Full PGO
1313
ENV DOTNET_TieredPGO 1
1414
ENV DOTNET_TC_QuickJitForLoops 1

frameworks/CSharp/appmpower/src/appMpower.Orm/appMpower.Orm.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<SelfContained>true</SelfContained>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010

11+
<!--TODOGITHUB-->
1112
<RuntimeIdentifier>linux-x64</RuntimeIdentifier> <!-- docker server -->
1213
<!--TODOLOCAL-->
1314
<!--<RuntimeIdentifier>linux-arm64</RuntimeIdentifier>--> <!-- docker local -->
@@ -36,7 +37,11 @@
3637
</PropertyGroup>
3738

3839
<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" />
4045
</ItemGroup>
4146

4247
</Project>

frameworks/CSharp/appmpower/src/appMpower/appMpower.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
<ItemGroup>
1010
<None Include="appsettings.json" CopyToOutputDirectory="PreserveNewest" />
1111

12+
<!--TODOLOCAL-->
1213
<!--
13-
<Content Include="../appMpower.Orm/bin/Release/net8.0/appMpower.Orm.dll">
14+
<Content Include="../appMpower.Orm/bin/Release/net9.0/appMpower.Orm.dll">
1415
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
1516
</Content>
1617
-->
17-
<!--TODOLOCAL-->
18+
<!--TODOLOCAL AOT-->
1819
<!--
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">
2021
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2122
</Content>
2223
-->

0 commit comments

Comments
 (0)