diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml deleted file mode 100644 index e48b3fd..0000000 --- a/.gitea/workflows/container.yaml +++ /dev/null @@ -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 }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..a477804 --- /dev/null +++ b/.gitlab-ci.yml @@ -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" diff --git a/Containerfile b/Dockerfile similarity index 70% rename from Containerfile rename to Dockerfile index 231e31f..e42dab8 100644 --- a/Containerfile +++ b/Dockerfile @@ -1,33 +1,31 @@ -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 \ - openjdk21-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 +RUN mvn package -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 AIRSONIC_DIR=/home/airsonic RUN apk add --no-cache \ - ca-certificates \ - openssl \ - ffmpeg \ - flac \ - opus \ - lame \ - openjdk21-jre-headless + ca-certificates \ + openssl \ + ffmpeg \ + flac \ + opus \ + lame \ + openjdk17-jre-headless RUN addgroup -g 2222 airsonic RUN adduser -h "$AIRSONIC_DIR" -S -D -u 2222 -G airsonic airsonic diff --git a/README.md b/README.md index 6e3e76b..0d77f86 100644 --- a/README.md +++ b/README.md @@ -6,19 +6,5 @@ - `/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 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 diff --git a/rootfs/etc/confd/conf.d/airsonic.properties.toml b/rootfs/etc/confd/conf.d/airsonic.properties.toml deleted file mode 100644 index 6f6084a..0000000 --- a/rootfs/etc/confd/conf.d/airsonic.properties.toml +++ /dev/null @@ -1,6 +0,0 @@ -[template] -src = "airsonic.properties.tmpl" -dest = "/home/airsonic/data/airsonic.properties" -gid = 2222 -uid = 2222 -mode = "0660" diff --git a/rootfs/etc/confd/templates/airsonic.properties.tmpl b/rootfs/etc/confd/templates/airsonic.properties.tmpl deleted file mode 100644 index 1b785c5..0000000 --- a/rootfs/etc/confd/templates/airsonic.properties.tmpl +++ /dev/null @@ -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 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/airsonic/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/airsonic/dependencies deleted file mode 100644 index 7ba7514..0000000 --- a/rootfs/etc/s6-overlay/s6-rc.d/airsonic/dependencies +++ /dev/null @@ -1 +0,0 @@ -confd