diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index bdd1162..8083057 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PROWLARR_DEVELOP\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/develop/changes?runtime=netcore&os=linux" | jq -r '.[0].version') + EXT_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/develop/changes?runtime=netcore&os=linuxmusl" | jq -r '.[0].version') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for prowlarr branch develop" diff --git a/Dockerfile b/Dockerfile index df33ded..d5c0eed 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,42 +1,40 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 # set version label ARG BUILD_DATE ARG VERSION ARG PROWLARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="Roxedus" +LABEL maintainer="Roxedus,thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG PROWLARR_BRANCH="develop" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ + apk add -U --upgrade --no-cache \ + curl \ jq \ - libicu66 \ - sqlite3 && \ + icu-libs \ + sqlite-libs && \ echo "**** install prowlarr ****" && \ mkdir -p /app/prowlarr/bin && \ if [ -z ${PROWLARR_RELEASE+x} ]; then \ - PROWLARR_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/changes?runtime=netcore&os=linux" \ + PROWLARR_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \ | jq -r '.[0].version'); \ fi && \ curl -o \ /tmp/prowlarr.tar.gz -L \ - "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/updatefile?version=${PROWLARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ - tar ixzf \ + "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/updatefile?version=${PROWLARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=x64" && \ + tar xzf \ /tmp/prowlarr.tar.gz -C \ /app/prowlarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/prowlarr/package_info && \ + echo -e "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/prowlarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ /app/prowlarr/bin/prowlarr.Update \ /tmp/* \ - /var/lib/apt/lists/* \ /var/tmp/* # copy local files @@ -44,4 +42,4 @@ COPY root/ / # ports and volumes EXPOSE 9696 -VOLUME /config \ No newline at end of file +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8cb65fe..3fb70dc 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,43 +1,40 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 # set version label ARG BUILD_DATE ARG VERSION ARG PROWLARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="Roxedus" +LABEL maintainer="Roxedus,thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG PROWLARR_BRANCH="develop" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ + apk add -U --upgrade --no-cache \ + curl \ jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ + icu-libs \ + sqlite-libs && \ echo "**** install prowlarr ****" && \ mkdir -p /app/prowlarr/bin && \ if [ -z ${PROWLARR_RELEASE+x} ]; then \ - PROWLARR_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/changes?runtime=netcore&os=linux" \ + PROWLARR_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \ | jq -r '.[0].version'); \ fi && \ curl -o \ /tmp/prowlarr.tar.gz -L \ - "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/updatefile?version=${PROWLARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ - tar ixzf \ + "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/updatefile?version=${PROWLARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm64" && \ + tar xzf \ /tmp/prowlarr.tar.gz -C \ /app/prowlarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/prowlarr/package_info && \ + echo -e "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/prowlarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ /app/prowlarr/bin/prowlarr.Update \ /tmp/* \ - /var/lib/apt/lists/* \ /var/tmp/* # copy local files @@ -45,4 +42,4 @@ COPY root/ / # ports and volumes EXPOSE 9696 -VOLUME /config \ No newline at end of file +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 736b3f6..0aaa8ca 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,43 +1,40 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 # set version label ARG BUILD_DATE ARG VERSION ARG PROWLARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="Roxedus" +LABEL maintainer="Roxedus,thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG PROWLARR_BRANCH="develop" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ + apk add -U --upgrade --no-cache \ + curl \ jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ + icu-libs \ + sqlite-libs && \ echo "**** install prowlarr ****" && \ mkdir -p /app/prowlarr/bin && \ if [ -z ${PROWLARR_RELEASE+x} ]; then \ - PROWLARR_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/changes?runtime=netcore&os=linux" \ + PROWLARR_RELEASE=$(curl -sL "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \ | jq -r '.[0].version'); \ fi && \ curl -o \ /tmp/prowlarr.tar.gz -L \ - "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/updatefile?version=${PROWLARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ - tar ixzf \ + "https://prowlarr.servarr.com/v1/update/${PROWLARR_BRANCH}/updatefile?version=${PROWLARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm" && \ + tar xzf \ /tmp/prowlarr.tar.gz -C \ /app/prowlarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/prowlarr/package_info && \ + echo -e "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/prowlarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ /app/prowlarr/bin/prowlarr.Update \ /tmp/* \ - /var/lib/apt/lists/* \ /var/tmp/* # copy local files @@ -45,4 +42,4 @@ COPY root/ / # ports and volumes EXPOSE 9696 -VOLUME /config \ No newline at end of file +VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index b2575db..c757eb3 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { DOCKERHUB_IMAGE = 'linuxserver/prowlarr' DEV_DOCKERHUB_IMAGE = 'lsiodev/prowlarr' PR_DOCKERHUB_IMAGE = 'lspipepr/prowlarr' - DIST_IMAGE = 'ubuntu' + DIST_IMAGE = 'alpine' MULTIARCH='true' CI='true' CI_WEB='true' @@ -104,7 +104,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL "https://prowlarr.servarr.com/v1/update/develop/changes?runtime=netcore&os=linux" | jq -r '.[0].version' ''', + script: ''' curl -sL "https://prowlarr.servarr.com/v1/update/develop/changes?runtime=netcore&os=linuxmusl" | jq -r '.[0].version' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index daf1282..b34d0e6 100755 --- a/README.md +++ b/README.md @@ -232,4 +232,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.02.22:** - Rebase develop branch to Alpine. * **06.06.21:** - Initial realease. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 4a68bf0..e53dbd4 100755 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,7 @@ # jenkins variables project_name: docker-prowlarr external_type: na -custom_version_command: curl -sL "https://prowlarr.servarr.com/v1/update/develop/changes?runtime=netcore&os=linux" | jq -r '.[0].version' +custom_version_command: curl -sL "https://prowlarr.servarr.com/v1/update/develop/changes?runtime=netcore&os=linuxmusl" | jq -r '.[0].version' release_type: prerelease release_tag: develop ls_branch: develop @@ -14,7 +14,7 @@ repo_vars: - DOCKERHUB_IMAGE = 'linuxserver/prowlarr' - DEV_DOCKERHUB_IMAGE = 'lsiodev/prowlarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/prowlarr' - - DIST_IMAGE = 'ubuntu' + - DIST_IMAGE = 'alpine' - MULTIARCH='true' - CI='true' - CI_WEB='true' diff --git a/readme-vars.yml b/readme-vars.yml index 93f11eb..eb0b6ad 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -43,4 +43,5 @@ app_setup_block: | # changelog changelogs: + - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." } - { date: "06.06.21:", desc: "Initial realease." }