Skip to content

Commit 92f1104

Browse files
authored
add jda-nas for linux musl (#911)
1 parent c70cef9 commit 92f1104

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

LavalinkServer/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ tasks {
127127
archiveFileName.set("Lavalink-musl.jar")
128128
// Exclude base dependency jar
129129
exclude {
130-
it.name.contains("lavaplayer-natives-fork") || it.name.contains("udpqueue-native-")
130+
it.name.contains("lavaplayer-natives-fork") || (it.name.contains("udpqueue-native-") && !it.name.contains("musl"))
131131
}
132132

133133
// Add custom jar

LavalinkServer/docker/alpine.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM azul/zulu-openjdk-alpine:17-jre-headless-latest
22

3+
RUN apk add --no-cache libgcc
4+
35
# Run as non-root user
46
RUN addgroup -g 322 -S lavalink && \
57
adduser -u 322 -S lavalink lavalink

LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ class KoeConfiguration(val serverConfig: ServerConfig) {
2020
SystemType(DefaultArchitectureTypes.X86_32, DefaultOperatingSystemTypes.LINUX),
2121
SystemType(DefaultArchitectureTypes.ARMv8_64, DefaultOperatingSystemTypes.LINUX),
2222

23+
SystemType(DefaultArchitectureTypes.X86_64, DefaultOperatingSystemTypes.LINUX_MUSL),
24+
SystemType(DefaultArchitectureTypes.ARMv8_64, DefaultOperatingSystemTypes.LINUX_MUSL),
25+
2326
SystemType(DefaultArchitectureTypes.X86_64, DefaultOperatingSystemTypes.WINDOWS),
2427
SystemType(DefaultArchitectureTypes.X86_32, DefaultOperatingSystemTypes.WINDOWS),
2528

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ fun VersionCatalogBuilder.voice() {
4747
library("koe", "moe.kyokobot.koe", "core").version("2.0.0-rc1")
4848
library("koe-udpqueue", "moe.kyokobot.koe", "ext-udpqueue").version("2.0.0-rc1")
4949

50-
version("udpqueue", "0.2.6")
51-
val platforms = listOf("linux-x86-64", "linux-x86", "linux-aarch64", "linux-arm", "win-x86-64", "win-x86", "darwin")
50+
version("udpqueue", "0.2.7")
51+
val platforms = listOf("linux-x86-64", "linux-x86", "linux-aarch64", "linux-arm", "linux-musl-x86-64", "linux-musl-aarch64", "win-x86-64", "win-x86", "darwin")
5252
platforms.forEach {
5353
library("udpqueue-native-$it", "club.minnced", "udpqueue-native-$it").versionRef("udpqueue")
5454
}

0 commit comments

Comments
 (0)