Skip to content

Correction of appmpower-odbc-pg.dockerfile build and version upgrades #9966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2025
Merged

Correction of appmpower-odbc-pg.dockerfile build and version upgrades #9966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5c2bc0
Build correction for appmpower-odbc-pg.dockerfile and upgraded versions
Jun 25, 2025
0ed9c30
appmpower-odbc-pg.dockerfile correction
Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
RUN apt-get update
RUN apt-get -yqq install clang zlib1g-dev
RUN apt-get update
Expand All @@ -8,7 +8,7 @@ COPY src .
RUN dotnet publish -c Release -o out /p:Database=mysql

# Construct the actual image that will run
FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime

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

WORKDIR /odbc

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

RUN cp /usr/lib/libm* /app
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
#TODOGITHUB
RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
#TODOLOCAL
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app

EXPOSE 8080

Expand Down
11 changes: 6 additions & 5 deletions frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
RUN apt-get update
RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
RUN apt-get -yqq install clang zlib1g-dev

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

# Construct the actual image that will run
FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime

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

#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
#TODOGITHUB
RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app

#TODOLOCAL
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app

EXPOSE 8080

Expand Down
6 changes: 3 additions & 3 deletions frameworks/CSharp/appmpower/appmpower.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
RUN apt-get update
RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
RUN apt-get -yqq install clang zlib1g-dev

WORKDIR /app
COPY src .
#RUN dotnet publish appMpower/appMpower.csproj -c Release -o out
RUN dotnet publish -c Release -o out

# Construct the actual image that will run
FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
# Full PGO
ENV DOTNET_TieredPGO 1
ENV DOTNET_TC_QuickJitForLoops 1
Expand Down
7 changes: 6 additions & 1 deletion frameworks/CSharp/appmpower/src/appMpower.Orm/appMpower.Orm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<SelfContained>true</SelfContained>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!--TODOGITHUB-->
<RuntimeIdentifier>linux-x64</RuntimeIdentifier> <!-- docker server -->
<!--TODOLOCAL-->
<!--<RuntimeIdentifier>linux-arm64</RuntimeIdentifier>--> <!-- docker local -->
Expand Down Expand Up @@ -36,7 +37,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Data.Odbc" Version="9.0.0" />
<RuntimeHostConfigurationOption Include="System.Threading.ThreadPool.HillClimbing.Disable" Value="true" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Data.Odbc" Version="9.0.6" />
</ItemGroup>

</Project>
7 changes: 4 additions & 3 deletions frameworks/CSharp/appmpower/src/appMpower/appMpower.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
<ItemGroup>
<None Include="appsettings.json" CopyToOutputDirectory="PreserveNewest" />

<!--TODOLOCAL-->
<!--
<Content Include="../appMpower.Orm/bin/Release/net8.0/appMpower.Orm.dll">
<Content Include="../appMpower.Orm/bin/Release/net9.0/appMpower.Orm.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
-->
<!--TODOLOCAL-->
<!--TODOLOCAL AOT-->
<!--
<Content Include="../appMpower.Orm/bin/Release/net8.0/osx-arm64/native/appMpower.Orm.dylib">
<Content Include="../appMpower.Orm/bin/Release/net9.0/osx-arm64/native/appMpower.Orm.dylib">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
-->
Expand Down
Loading