diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index f4118eaa..34940bf1 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -20,7 +20,7 @@ jobs: echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. **** - MOD_VERSION=${GITHUB_SHA:0:7} + MOD_VERSION="2.4.0" echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT outputs: GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }} diff --git a/Dockerfile b/Dockerfile index 3bfd9449..bdcd8c28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ # syntax=docker/dockerfile:1 ## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage - +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage ARG MOD_VERSION # copy local files @@ -17,8 +16,14 @@ RUN \ ## Single layer deployed image ## FROM scratch +ARG MOD_VERSION -LABEL maintainer="TheCaptain989" +LABEL org.opencontainers.image.title=lidarr-flac2mp3 +LABEL org.opencontainers.image.description="A Docker Mod to Lidarr to automatically convert FLAC files to MP3s, or other format" +LABEL org.opencontainers.image.version="${MOD_VERSION}" +LABEL org.opencontainers.image.source="https://github.com/TheCaptain989/lidarr-flac2mp3" +LABEL org.opencontainers.image.authors="TheCaptain989 " +LABEL org.opencontainers.image.licenses=GPL-3.0-only # Add files from buildstage COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 57fe035c..f565d64d 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,12 @@ A [Batch Mode](./README.md#batch-mode) is also supported that allows usage outsi >**NOTE:** This mod supports Linux OSes only. -Production Container info: ![Docker Image Size](https://img.shields.io/docker/image-size/linuxserver/mods/lidarr-flac2mp3 "Container Size") +Production Container info: ![Docker Image Size](https://img.shields.io/docker/image-size/linuxserver/mods/lidarr-flac2mp3 "Container Size") +[![linuxserver/docker-mods/mods/lidarr-flac2mp3](https://img.shields.io/badge/dynamic/json?logo=github&url=https%3A%2F%2Fraw.githubusercontent.com%2Fthecaptain989%2Fghcr-pulls%2Fmaster%2Findex.json&query=%24%5B%3F(%40.owner%3D%3D%22linuxserver%22%20%26%26%20%40.repo%3D%3D%22docker-mods%22%20%26%26%20%40.image%3D%3D%22mods%22%20%26%26%20%40.tag%3D%3D%22lidarr-flac2mp3%22)%5D.pulls&label=ghcr%20pulls&color=1572A4)](https://github.com/linuxserver/docker-mods/pkgs/container/mods) Development Container info: ![Docker Image Size](https://img.shields.io/docker/image-size/thecaptain989/lidarr-flac2mp3 "Container Size") -![Docker Pulls](https://img.shields.io/docker/pulls/thecaptain989/lidarr-flac2mp3 "Container Pulls") +![Docker Pulls](https://img.shields.io/docker/pulls/thecaptain989/lidarr-flac2mp3?logo=docker "Container Pulls") +[![GitHub Super-Linter](https://github.com/TheCaptain989/lidarr-flac2mp3/actions/workflows/linter.yml/badge.svg)](https://github.com/TheCaptain989/lidarr-flac2mp3/actions/workflows/linter.yml "Linter Job") # Installation 1. Pull the [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr "LinuxServer.io's Lidarr container") docker image from GitHub Container Registry or Docker Hub: diff --git a/SECURITY.md b/SECURITY.md index eca05c7e..e7c48abb 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,13 +6,13 @@ Only the latest major and minor version are supported. | Version | Supported | | ------- | ------------------ | -| 2.3.x | :heavy_check_mark: | -| < 2.3 | :x: | +| 2.4.x | :heavy_check_mark: | +| < 2.4 | :x: | ## Reporting a Vulnerability Vulnerability reports or security concerns may be submitted as a new issue in GitHub, or emailed to: ->thecaptain989@protonmail.com +> Please allow 48-hours for an initial response. An issue will be entered if accepted. diff --git a/root/usr/local/bin/flac2mp3.sh b/root/usr/local/bin/flac2mp3.sh index 0863f34d..f1ce1453 100755 --- a/root/usr/local/bin/flac2mp3.sh +++ b/root/usr/local/bin/flac2mp3.sh @@ -644,6 +644,12 @@ elif [ -f "$flac2mp3_config" ]; then [[ $flac2mp3_xml_entity = "ApiKey" ]] && flac2mp3_apikey=$flac2mp3_xml_content done < $flac2mp3_config + # Allow use of environment variables from https://github.com/Lidarr/Lidarr/pull/4812 + [ -n "${LIDARR__SERVER__PORT}" ] && flac2mp3_port="${LIDARR__SERVER__PORT}" + [ -n "${LIDARR__SERVER__URLBASE}" ] && flac2mp3_urlbase="${LIDARR__SERVER__URLBASE}" + [ -n "${LIDARR__SERVER__BINDADDRESS}" ] && flac2mp3_bindaddress="${LIDARR__SERVER__BINDADDRESS}" + [ -n "${LIDARR__AUTH__APIKEY}" ] && flac2mp3_apikey="${LIDARR__AUTH__APIKEY}" + # Check for localhost [[ $flac2mp3_bindaddress = "*" ]] && flac2mp3_bindaddress=localhost