use java 21

They make trouble in a kaniko environment and as this container is about
to be retired anyways it is not too important.

.gitea/workflows/container.yaml

@@ -0,0 +1,12 @@
+name: Build Multiarch Container Image
+on: [push]
+jobs:
+  call-reusable-workflow:
+    uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main
+    with:
+      repository: ${{ gitea.repository }}
+      ref_name: ${{ gitea.ref_name }}
+      sha: ${{ gitea.sha }}
+      registry_url: ${{ secrets.REGISTRY_URL }}
+      registry_user: ${{ secrets.REGISTRY_USER }}
+      registry_pw: ${{ secrets.REGISTRY_PW }}

.gitlab-ci.yml

@@ -1,19 +0,0 @@
-variables:
-  CONTAINER_NAME: thallian/airsonic
-
-build:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
-    - >-
-      /kaniko/executor
-      --cache=false
-      --context "$CI_PROJECT_DIR"
-      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
-      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
-      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
-      --destination "$CONTAINER_NAME:latest"

Containerfile

@@ -1,31 +1,33 @@
-FROM alpine:3.15 AS builder
+FROM docker.io/alpine:3.19 AS builder
 
-ENV VERSION=11.0.0-SNAPSHOT.20220213174344
+ENV VERSION=11.0.0-SNAPSHOT.20230217142243
 RUN apk add --no-cache \
-    openjdk17-jdk \
+  openjdk21-jdk \
-    maven \
+  maven \
-    git
+  git
 
 RUN git clone https://github.com/airsonic-advanced/airsonic-advanced 
 
 WORKDIR /airsonic-advanced
+COPY mvn.patch .
 RUN git checkout "$VERSION"
-RUN mvn package
+RUN git apply mvn.patch
+RUN mvn package -DskipTests
 
 
-FROM thallian/alpine-s6:latest
+FROM docker.io/thallian/confd-env:3.19-3.1.6.2
 
 ENV JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
 ENV AIRSONIC_DIR=/home/airsonic
 
 RUN apk add --no-cache \
-    ca-certificates \
+  ca-certificates \
-    openssl \
+  openssl \
-    ffmpeg \
+  ffmpeg \
-    flac \
+  flac \
-    opus \
+  opus \
-    lame \
+  lame \
-	openjdk17-jre-headless
+  openjdk21-jre-headless
 
 RUN addgroup -g 2222 airsonic
 RUN adduser -h "$AIRSONIC_DIR" -S -D -u 2222 -G airsonic airsonic

README.md

@@ -6,5 +6,19 @@
 - `/home/airsonic/playlists`
 - `/home/airsonic/podcasts`
 
+# Environment Variables
+## DB_URL
+
+JDBC url for the postgres conection.
+
+## DB_USER
+- default: airsonic
+
+Username with which to connect to the database.
+
+## DB_PASSWORD
+
+Password for the databse connection.
+
 # Ports
 - 8080

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

rootfs/etc/confd/conf.d/airsonic.properties.toml

@@ -0,0 +1,6 @@
+[template]
+src = "airsonic.properties.tmpl"
+dest = "/home/airsonic/data/airsonic.properties"
+gid = 2222
+uid = 2222
+mode = "0660"

rootfs/etc/confd/templates/airsonic.properties.tmpl

@@ -0,0 +1,6 @@
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url={{ getenv "DB_URL" }}
+spring.datasource.username={{ getenv "DB_USER" "airsonic" }}
+spring.datasource.password={{ getenv "DB_PASSWORD" }}
+spring.liquibase.parameters.userTableQuote="
+server.forward-headers-strategy=native

rootfs/etc/s6-overlay/s6-rc.d/airsonic/dependencies

@@ -0,0 +1 @@
+confd