Skip to content

Commit 55eb612

Browse files
authored
Merge pull request #92 from standleypg-dev/Task/version-upgrade
Added libdave bin
2 parents 98ed4d5 + a17acce commit 55eb612

3 files changed

Lines changed: 24 additions & 20 deletions

File tree

deployment/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@ RUN apk add --no-cache \
1010
libsodium-dev \
1111
opus-dev \
1212
yt-dlp \
13+
wget \
1314
tzdata && \
1415
ln -sf /usr/share/zoneinfo/Asia/Singapore /etc/localtime
1516

17+
RUN wget -O /tmp/libdave.zip \
18+
https://github.com/discord/libdave/releases/download/v1.1.1/cpp/libdave-Linux-X64-boringssl.zip && \
19+
unzip /tmp/libdave.zip -d /tmp/libdave && \
20+
cp /tmp/libdave/lib/*.so /usr/lib/ && \
21+
rm -rf /tmp/libdave /tmp/libdave.zip
22+
1623
FROM lib-build AS build
1724

1825
ARG BUILD_CONFIGURATION=Release
@@ -50,7 +57,7 @@ RUN apk add --no-cache \
5057
tzdata \
5158
yt-dlp && \
5259
ln -sf /usr/share/zoneinfo/Asia/Singapore /etc/localtime
53-
60+
5461
WORKDIR /app/run
5562

5663
ENV ASPNETCORE_ENVIRONMENT=Production

src/Directory.Packages.props

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
<Project>
22
<PropertyGroup>
3-
<!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
43
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
54
</PropertyGroup>
65
<ItemGroup>
7-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
8-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
9-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
10-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.3" />
11-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
12-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
6+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
7+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5" />
8+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.5" />
9+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
10+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
11+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
1312
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
14-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageVersion>
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5" />
1814
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
19-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.3"/>
21-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3"/>
22-
<PackageVersion Include="NetCord" Version="1.0.0-alpha.427" />
23-
<PackageVersion Include="NetCord.Hosting" Version="1.0.0-alpha.427" />
24-
<PackageVersion Include="NetCord.Hosting.Services" Version="1.0.0-alpha.427" />
25-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0"/>
26-
<PackageVersion Include="NAudio" Version="2.2.1"/>
15+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.5" />
16+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.5"/>
17+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5"/>
18+
<PackageVersion Include="NetCord" Version="1.0.0-alpha.475" />
19+
<PackageVersion Include="NetCord.Hosting" Version="1.0.0-alpha.475" />
20+
<PackageVersion Include="NetCord.Hosting.Services" Version="1.0.0-alpha.475" />
21+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1"/>
22+
<PackageVersion Include="NAudio" Version="2.3.0"/>
2723
<PackageVersion Include="SoundCloudExplode" Version="1.6.7" />
2824
<PackageVersion Include="SoundTouch.Net.NAudioSupport" Version="2.3.2"/>
2925
<PackageVersion Include="YoutubeDLSharp" Version="1.2.0"/>

src/Worker/Worker.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<ItemGroup Condition="'$(IsUnix)' == 'true'">
4848
<NativeLibs Include="/usr/lib/libsodium.so" />
4949
<NativeLibs Include="/usr/lib/libopus.so" />
50+
<NativeLibs Include="/usr/lib/libdave.so" />
5051
<NativeLibs Include="/usr/bin/yt-dlp" />
5152
</ItemGroup>
5253

0 commit comments

Comments
 (0)