From 2057d39e32b0be438d450dbd3f49418fc39892e6 Mon Sep 17 00:00:00 2001
From: TheCaptain989 <thecaptain989@protonmail.com>
Date: Sat, 18 May 2024 21:20:55 -0500
Subject: [PATCH] Release 2.4

- Allow use of optional environmental variables for Lidarr config
- Updated Docker labels
---
 Dockerfile                     | 5 ++++-
 README.md                      | 1 +
 SECURITY.md                    | 2 +-
 root/usr/local/bin/flac2mp3.sh | 6 ++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3bfd944..9f818be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,10 @@ RUN \
 ## Single layer deployed image ##
 FROM scratch
 
-LABEL maintainer="TheCaptain989"
+LABEL org.opencontainers.image.source=https://github.com/TheCaptain989/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.licenses=GPL-3.0-only
+LABEL org.opencontainers.image.authors="TheCaptain989"
 
 # Add files from buildstage
 COPY --from=buildstage /root-layer/ /
diff --git a/README.md b/README.md
index 57fe035..c1616f3 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Production Container info: ![Docker Image Size](https://img.shields.io/docker/im
 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")
+[![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 eca05c7..1e949b4 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,6 +13,6 @@ Only the latest major and minor version are supported.
 
 Vulnerability reports or security concerns may be submitted as a new issue in GitHub, or emailed to:
 
->thecaptain989@protonmail.com
+><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 0863f34..f1ce145 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