Skip to content

Commit

Permalink
fix: fix libssl env
Browse files Browse the repository at this point in the history
  • Loading branch information
nidbCN committed Nov 15, 2024
1 parent 22e9a77 commit f34026c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
9 changes: 3 additions & 6 deletions CameraCaptureBot.Core/CameraCaptureBot.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@
<FileVersion>8.1.4.4</FileVersion>
</PropertyGroup>

<ItemGroup>
<Compile Remove="SignProviders\**" />
<Content Remove="SignProviders\**" />
<EmbeddedResource Remove="SignProviders\**" />
<None Remove="SignProviders\**" />
</ItemGroup>
<PropertyGroup>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FFmpeg.AutoGen" Version="7.0.0" />
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ RUN dotnet build "./CameraCaptureBot.Core/CameraCaptureBot.Core.csproj" -c $BUIL

FROM build AS publish
ARG BUILD_CONFIGURATION=Release
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
RUN dotnet publish "./CameraCaptureBot.Core/CameraCaptureBot.Core.csproj" \
-c $BUILD_CONFIGURATION \
--self-contained true \
--runtime linux-x64 \
-p:PublishTrimmed=true \
-o /app/publish

FROM base AS final
Expand Down
10 changes: 9 additions & 1 deletion Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
FROM debian:bookworm-slim AS base
USER root

ENV DEBIAN_FRONTEND=noninteractive
RUN cp /etc/apt/sources.list.d/debian.sources /tmp/debian.sources.bak && \
sed -i 's|deb.debian.org/debian|ftp.cn.debian.org/debian|g' /etc/apt/sources.list.d/debian.sources && \
apt update && \
apt install -y --no-install-recommends libssl3 && \
apt clean && \
rm -rf /var/lib/apt/lists && \
mv /tmp/debian.sources.bak /etc/apt/sources.list.d/debian.sources

# a future that my docker will copy the file behind soft link.
COPY ./ffmpeg/lib/*.so /usr/lib/x86_64-linux-gnu/

0 comments on commit f34026c

Please sign in to comment.