From 2057d39e32b0be438d450dbd3f49418fc39892e6 Mon Sep 17 00:00:00 2001 From: TheCaptain989 Date: Sat, 18 May 2024 21:20:55 -0500 Subject: [PATCH 1/5] 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 3bfd9449..9f818be7 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 57fe035c..c1616f36 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 eca05c7e..1e949b4f 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 +> 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 From bd775d40c8cf4da8596f77d3c348bc2ada0d5d29 Mon Sep 17 00:00:00 2001 From: TheCaptain989 Date: Tue, 18 Jun 2024 18:29:38 -0500 Subject: [PATCH 2/5] Update README.md - Added GHCR pull count --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c1616f36..f565d64d 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,11 @@ 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 From 750adb75d92ccb3f93d38c4f0cef7a319f4a78cc Mon Sep 17 00:00:00 2001 From: TheCaptain989 Date: Fri, 21 Jun 2024 15:54:06 -0500 Subject: [PATCH 3/5] Update Dockerfile - Bump to Alpine 3.20 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f818be7..9e4f4e28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +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 @@ -21,7 +21,7 @@ FROM scratch 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" +LABEL org.opencontainers.image.authors="TheCaptain989 " # Add files from buildstage COPY --from=buildstage /root-layer/ / From f44d4c4d92e4fe2b7725bc84bfa637ab33d88262 Mon Sep 17 00:00:00 2001 From: TheCaptain989 Date: Sun, 18 Aug 2024 10:00:04 -0500 Subject: [PATCH 4/5] Pre for PR --- .github/workflows/BuildImage.yml | 2 +- Dockerfile | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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 9e4f4e28..bdcd8c28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ ## Buildstage ## FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage - ARG MOD_VERSION # copy local files @@ -17,11 +16,14 @@ RUN \ ## Single layer deployed image ## FROM scratch +ARG MOD_VERSION -LABEL org.opencontainers.image.source=https://github.com/TheCaptain989/lidarr-flac2mp3 +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.licenses=GPL-3.0-only +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/ / From b4533b564421c2e1977ff48727f7561c4b915018 Mon Sep 17 00:00:00 2001 From: TheCaptain989 Date: Sun, 18 Aug 2024 10:04:05 -0500 Subject: [PATCH 5/5] Updated version --- SECURITY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 1e949b4f..e7c48abb 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,8 +6,8 @@ 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