From 3803ecd35dc291b9002bc88967c4eb448da2c8f0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 9 May 2024 06:56:57 +0000 Subject: [PATCH] ci: Potential fix for the docker build --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2dc34150..1751b51a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,10 @@ FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build WORKDIR /source COPY src/Nadeko.Medusa/*.csproj src/Nadeko.Medusa/ -COPY src/Nadeko.Econ/*.csproj src/Nadeko.Econ/ -COPY src/Nadeko.Common/*.csproj src/Nadeko.Common/ COPY src/NadekoBot/*.csproj src/NadekoBot/ COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/ COPY src/NadekoBot.Generators/*.csproj src/NadekoBot.Generators/ -COPY src/ayu/NadekoBot.Voice/*.csproj src/ayu/NadekoBot.Voice/ +COPY src/NadekoBot.Voice/*.csproj src/NadekoBot.Voice/ COPY NuGet.Config ./ RUN dotnet restore src/NadekoBot/ @@ -17,7 +15,7 @@ RUN set -xe; \ dotnet --version; \ dotnet publish -c Release -o /app --no-restore; \ mv /app/data /app/data_init; \ - rm -Rf libopus* libsodium* opus.* runtimes/win* runtimes/osx* runtimes/linux-arm* runtimes/linux-mips*; \ + rm -Rf runtimes/win* runtimes/osx* runtimes/linux-arm* runtimes/linux-mips*; \ find /app -type f -exec chmod -x {} \; ;\ chmod +x /app/NadekoBot @@ -28,7 +26,7 @@ WORKDIR /app RUN set -xe; \ useradd -m nadeko; \ apt-get update; \ - apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 sudo; \ + apt-get install -y --no-install-recommends libsqlite3-0 curl ffmpeg python3 sudo; \ update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1; \ echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \ curl -Lo /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp; \