From bc74bdc6365b7352ee36ea71d47e21ddaf92b899 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 27 May 2024 12:57:20 +0200 Subject: [PATCH] push to 11.0.0-SNAPSHOT.20240424015024 --- Containerfile | 8 +++----- mvn.patch | 8 -------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 mvn.patch diff --git a/Containerfile b/Containerfile index 231e31f..1acf2f4 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ -FROM docker.io/alpine:3.19 AS builder +FROM docker.io/alpine:3.20 AS builder -ENV VERSION=11.0.0-SNAPSHOT.20230217142243 +ENV VERSION=11.0.0-SNAPSHOT.20240424015024 RUN apk add --no-cache \ openjdk21-jdk \ maven \ @@ -9,13 +9,11 @@ RUN apk add --no-cache \ 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.19-3.1.6.2 +FROM docker.io/thallian/confd-env:3.20-3.1.6.2 ENV JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 ENV AIRSONIC_DIR=/home/airsonic diff --git a/mvn.patch b/mvn.patch deleted file mode 100644 index 35fda35..0000000 --- a/mvn.patch +++ /dev/null @@ -1,8 +0,0 @@ -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