From 5500d97bf3c846153e5b7126fd33b0e22785310d Mon Sep 17 00:00:00 2001 From: "Y.Tory" <5343692+kagemomiji@users.noreply.github.com> Date: Fri, 31 Mar 2023 00:09:50 +0000 Subject: [PATCH 1/5] add distribution temurin to setup-java action Signed-off-by: Y.Tory <5343692+kagemomiji@users.noreply.github.com> --- .github/workflows/codeql.yml | 3 ++- .github/workflows/edge.yml | 1 + .github/workflows/pr_ci.yml | 4 +--- .github/workflows/stable.yml | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 63e632bde..851c7d781 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -27,9 +27,10 @@ jobs: uses: actions/checkout@v3 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 + distribution: temurin - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/edge.yml b/.github/workflows/edge.yml index 44d546e85..78be9f899 100644 --- a/.github/workflows/edge.yml +++ b/.github/workflows/edge.yml @@ -18,6 +18,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: 11 + distribution: temurin - name: Cache Maven packages uses: actions/cache@v3 with: diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index 09289f84e..d21af4b08 100644 --- a/.github/workflows/pr_ci.yml +++ b/.github/workflows/pr_ci.yml @@ -19,6 +19,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: ${{ matrix.cfg.jdk }} + distribution: 'temurin' - name: Cache Maven packages uses: actions/cache@v3 with: @@ -39,9 +40,6 @@ jobs: - jdk: 11 services: {} env: {} - - jdk: 14 - services: {} - env: {} - jdk: 16 services: {} env: {} diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index 332756fcc..a6b602538 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -14,6 +14,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: 11 + distribution: temurin - name: Cache Maven packages uses: actions/cache@v3 with: From b3ca7f95be924e67e46f7baa62df773e82665066 Mon Sep 17 00:00:00 2001 From: "Y.Tory" <5343692+kagemomiji@users.noreply.github.com> Date: Thu, 2 Mar 2023 16:50:12 +0000 Subject: [PATCH 2/5] [chore]: fix failure of build with maven in GitHub Action Fixes kagemomiji/airsonic-advanced#133 Signed-off-by: Y.Tory <5343692+kagemomiji@users.noreply.github.com> --- .mvn/maven.config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 7bd692d79..e6ce9c19c 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1,3 @@ ---settings ./.mvn/settings.xml +--settings +./.mvn/settings.xml + From 7d015b59c2565ce558bcc88fe5c0b74dc9d9cf66 Mon Sep 17 00:00:00 2001 From: "Y.Tory" <5343692+kagemomiji@users.noreply.github.com> Date: Fri, 31 Mar 2023 00:59:55 +0000 Subject: [PATCH 3/5] update Dockerfile to use the latest temurin java 17 version of the base image Signed-off-by: Y.Tory <5343692+kagemomiji@users.noreply.github.com> --- install/docker/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/install/docker/Dockerfile b/install/docker/Dockerfile index ebb68a617..f4ea11262 100644 --- a/install/docker/Dockerfile +++ b/install/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk:14-jdk-hotspot AS builder +FROM eclipse-temurin:17.0.5_8-jdk AS builder WORKDIR target COPY run.sh /usr/local/bin/run.sh @@ -13,7 +13,7 @@ RUN mv WEB-INF/lib lib RUN mv WEB-INF/classes/META-INF cMETA-INF RUN mv WEB-INF/classes/liquibase cliquibase -FROM adoptopenjdk:14-jre-hotspot +FROM eclipse-temurin:17.0.5_8-jre-jammy LABEL description="Airsonic-Advanced is a free, web-based media streamer, providing ubiquitous access to your music." \ url="https://github.com/airsonic-advanced/airsonic-advanced" @@ -22,19 +22,19 @@ ENV AIRSONIC_PORT=4040 AIRSONIC_DIR=/var CONTEXT_PATH=/ UPNP_PORT=4041 PUID=0 PG WORKDIR $AIRSONIC_DIR -RUN apt-get update && \ - apt-get install -y software-properties-common && \ - add-apt-repository -y ppa:savoury1/ffmpeg4 && \ - apt-get update && \ - apt-get install -y ffmpeg \ +RUN apt-get update \ + && apt-get install -y \ + ffmpeg \ x264 \ x265 \ lame \ xmp \ bash \ - ttf-dejavu \ - gosu - + fonts-dejavu \ + gosu \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + COPY --from=builder /usr/local/bin/run.sh /usr/local/bin/run.sh COPY --from=builder /usr/local/bin/entry.sh /usr/local/bin/entry.sh From d172c9e264947e369ac4c821b883509b3517f16d Mon Sep 17 00:00:00 2001 From: Daniel Stefani Date: Sat, 19 Aug 2023 14:38:23 +0200 Subject: [PATCH 4/5] patch: add css rule to force icon size to 24px (like default icons) --- .../src/main/webapp/WEB-INF/jsp/top.jsp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp index d4aae4787..006949d3e 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp @@ -139,45 +139,45 @@ - ${home} + ${home}
${home}
- ${nowPlaying} + ${nowPlaying}
${nowPlaying}
- ${starred} + ${starred}
${starred}
- ${playlists} + ${playlists}
${playlists}
- ${podcast} + ${podcast}
${podcast}
- ${bookmarks} + ${bookmarks}
${bookmarks}
- ${settings} + ${settings}
${settings}
 - ${status} + ${status}
${status}
- ${more} + ${more}
${more}
- ${help} + ${help}
${help}
From 75fa71d2daca888c4b11a16636d85ceb6f960a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Viem=20Ness?= Date: Wed, 20 Mar 2024 00:11:12 +0100 Subject: [PATCH 5/5] Updated SystemCallFilter in SystemD service template Should fix https://github.com/airsonic-advanced/airsonic-advanced/issues/846 and other crashes related to backup. See https://github.com/airsonic-advanced/airsonic-advanced/issues/846#issuecomment-2008312228 for a detailed explanation on the reason behind this change. --- contrib/airsonic.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/airsonic.service b/contrib/airsonic.service index 09a54a202..2b31231ad 100644 --- a/contrib/airsonic.service +++ b/contrib/airsonic.service @@ -34,7 +34,7 @@ ProtectKernelTunables=yes RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 RestrictNamespaces=yes RestrictRealtime=yes -SystemCallFilter=~@clock @debug @module @mount @obsolete @privileged @reboot @setuid @swap +SystemCallFilter=@basic-io @file-system @chown @network-io @sync @timer @signal @process @system-service ReadWritePaths=/var/airsonic # You can change the following line to `strict` instead of `full`