add jda-nas for linux musl (#920)

lavalink-devs · Jul 21, 2023 · 6ba2986 · 6ba2986
1 parent afbb146
commit 6ba2986
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/LavalinkServer/build.gradle.kts b/LavalinkServer/build.gradle.kts
@@ -137,7 +137,7 @@ tasks {
             archiveFileName.set("Lavalink-musl.jar")
             // Exclude base dependency jar
             exclude {
-                it.name.contains("lavaplayer-natives-fork") || it.name.contains("udpqueue-native-")
+                it.name.contains("lavaplayer-natives-fork") || (it.name.contains("udpqueue-native-") && !it.name.contains("musl"))
             }
 
             // Add custom jar

diff --git a/LavalinkServer/docker/alpine.Dockerfile b/LavalinkServer/docker/alpine.Dockerfile
@@ -1,5 +1,7 @@
 FROM azul/zulu-openjdk-alpine:17-jre-headless-latest
 
+RUN apk add --no-cache libgcc
+
 # Run as non-root user
 RUN addgroup -g 322 -S lavalink && \
     adduser -u 322 -S lavalink lavalink

diff --git a/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt b/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt
@@ -20,6 +20,9 @@ class KoeConfiguration(val serverConfig: ServerConfig) {
         SystemType(DefaultArchitectureTypes.X86_32, DefaultOperatingSystemTypes.LINUX),
         SystemType(DefaultArchitectureTypes.ARMv8_64, DefaultOperatingSystemTypes.LINUX),
 
+        SystemType(DefaultArchitectureTypes.X86_64, DefaultOperatingSystemTypes.LINUX_MUSL),
+        SystemType(DefaultArchitectureTypes.ARMv8_64, DefaultOperatingSystemTypes.LINUX_MUSL),
+
         SystemType(DefaultArchitectureTypes.X86_64, DefaultOperatingSystemTypes.WINDOWS),
         SystemType(DefaultArchitectureTypes.X86_32, DefaultOperatingSystemTypes.WINDOWS),
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -36,7 +36,7 @@ fun VersionCatalogBuilder.spring() {
 }
 
 fun VersionCatalogBuilder.voice() {
-    version("lavaplayer", "17c75f5")
+    version("lavaplayer", "17c75f51f9")
 
     library("lavaplayer",            "com.github.walkyst.lavaplayer-fork", "lavaplayer").versionRef("lavaplayer")
     library("lavaplayer-ip-rotator", "com.github.walkyst.lavaplayer-fork", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer")
@@ -45,8 +45,8 @@ fun VersionCatalogBuilder.voice() {
     library("koe",          "moe.kyokobot.koe", "core").version("2.0.0-rc1")
     library("koe-udpqueue", "moe.kyokobot.koe", "ext-udpqueue").version("2.0.0-rc1")
 
-    version("udpqueue", "0.2.6")
-    val platforms = listOf("linux-x86-64", "linux-x86", "linux-aarch64", "linux-arm", "win-x86-64", "win-x86", "darwin")
+    version("udpqueue", "0.2.7")
+    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")
     platforms.forEach {
         library("udpqueue-native-$it", "club.minnced", "udpqueue-native-$it").versionRef("udpqueue")
     }