Compare commits

..

No commits in common. "21b4d10829dec5aba16b2389081f6fd53ae8828c" and "36591b4322a7ec5658a1dd862b061af94f6b71bf" have entirely different histories.

8 changed files with 33 additions and 63 deletions

View File

@ -1,12 +0,0 @@
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 }}

19
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,19 @@
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"

View File

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

View File

@ -6,19 +6,5 @@
- `/home/airsonic/playlists` - `/home/airsonic/playlists`
- `/home/airsonic/podcasts` - `/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 # Ports
- 8080 - 8080

View File

@ -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

View File

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

View File

@ -1,6 +0,0 @@
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

View File

@ -1 +0,0 @@
confd