diff --git a/Dockerfile b/Dockerfile index 676b83d..917b0d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,21 @@ -FROM docker.io/alpine:3.17 AS builder +FROM docker.io/alpine:3.18 AS builder -ENV VERSION=11.0.0-SNAPSHOT.20230217142243 +ENV VERSION=11.0.0-SNAPSHOT.20230217142243 RUN apk add --no-cache \ - openjdk17-jdk \ - maven \ - git + openjdk17-jdk \ + maven \ + git RUN git clone https://github.com/airsonic-advanced/airsonic-advanced WORKDIR /airsonic-advanced +COPY mvn.patch . RUN git checkout "$VERSION" +RUN git apply mvn.patch RUN mvn package -DskipTests -FROM docker.io/thallian/confd-env:3.17-3.1.3.0 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 ENV JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 ENV AIRSONIC_DIR=/home/airsonic @@ -25,7 +27,7 @@ RUN apk add --no-cache \ flac \ opus \ lame \ - openjdk17-jre-headless + openjdk17-jre-headless RUN addgroup -g 2222 airsonic RUN adduser -h "$AIRSONIC_DIR" -S -D -u 2222 -G airsonic airsonic diff --git a/mvn.patch b/mvn.patch new file mode 100644 index 0000000..35fda35 --- /dev/null +++ b/mvn.patch @@ -0,0 +1,8 @@ +diff --git a/.mvn/maven.config b/.mvn/maven.config +index 7bd692d7..89f6445d 100644 +--- a/.mvn/maven.config ++++ b/.mvn/maven.config +@@ -1 +1,2 @@ +---settings ./.mvn/settings.xml ++--settings ++./.mvn/settings.xml