Rebase develop back to ubuntu due to Alpine dropping mono
This commit is contained in:
21
Dockerfile
21
Dockerfile
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
|
||||
FROM ghcr.io/linuxserver/baseimage-mono:focal
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -8,18 +8,23 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="thespad"
|
||||
|
||||
# set environment variables
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
ENV XDG_CONFIG_HOME="/config/xdg"
|
||||
ENV SONARR_BRANCH="develop"
|
||||
|
||||
RUN \
|
||||
echo "**** add mediaarea repository ****" && \
|
||||
curl -L \
|
||||
"https://mediaarea.net/repo/deb/repo-mediaarea_1.0-12_all.deb" \
|
||||
-o /tmp/key.deb && \
|
||||
dpkg -i /tmp/key.deb && \
|
||||
echo "deb https://mediaarea.net/repo/deb/ubuntu focal main" | tee /etc/apt/sources.list.d/mediaarea.list && \
|
||||
echo "**** install packages ****" && \
|
||||
apk add -U --upgrade --no-cache \
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
curl \
|
||||
jq \
|
||||
libmediainfo \
|
||||
sqlite-libs && \
|
||||
apk add -U --upgrade --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||
mono && \
|
||||
mediainfo && \
|
||||
echo "**** install sonarr ****" && \
|
||||
mkdir -p /app/sonarr/bin && \
|
||||
if [ -z ${SONARR_VERSION+x} ]; then \
|
||||
@@ -32,10 +37,12 @@ RUN \
|
||||
tar xzf \
|
||||
/tmp/sonarr.tar.gz -C \
|
||||
/app/sonarr/bin --strip-components=1 && \
|
||||
echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \
|
||||
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \
|
||||
rm -rf /app/sonarr/bin/Sonarr.Update && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/var/lib/apt/lists/* \
|
||||
/tmp/* \
|
||||
/var/tmp/*
|
||||
|
||||
|
||||
@@ -8,18 +8,23 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="thespad"
|
||||
|
||||
# set environment variables
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
ENV XDG_CONFIG_HOME="/config/xdg"
|
||||
ENV SONARR_BRANCH="develop"
|
||||
|
||||
RUN \
|
||||
echo "**** add mediaarea repository ****" && \
|
||||
curl -L \
|
||||
"https://mediaarea.net/repo/deb/repo-mediaarea_1.0-12_all.deb" \
|
||||
-o /tmp/key.deb && \
|
||||
dpkg -i /tmp/key.deb && \
|
||||
echo "deb https://mediaarea.net/repo/deb/ubuntu focal main" | tee /etc/apt/sources.list.d/mediaarea.list && \
|
||||
echo "**** install packages ****" && \
|
||||
apk add -U --upgrade --no-cache \
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
curl \
|
||||
jq \
|
||||
libmediainfo \
|
||||
sqlite-libs && \
|
||||
apk add -U --upgrade --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||
mono && \
|
||||
mediainfo && \
|
||||
echo "**** install sonarr ****" && \
|
||||
mkdir -p /app/sonarr/bin && \
|
||||
if [ -z ${SONARR_VERSION+x} ]; then \
|
||||
@@ -32,10 +37,12 @@ RUN \
|
||||
tar xzf \
|
||||
/tmp/sonarr.tar.gz -C \
|
||||
/app/sonarr/bin --strip-components=1 && \
|
||||
echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \
|
||||
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \
|
||||
rm -rf /app/sonarr/bin/Sonarr.Update && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/var/lib/apt/lists/* \
|
||||
/tmp/* \
|
||||
/var/tmp/*
|
||||
|
||||
|
||||
@@ -8,18 +8,23 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="thespad"
|
||||
|
||||
# set environment variables
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
ENV XDG_CONFIG_HOME="/config/xdg"
|
||||
ENV SONARR_BRANCH="develop"
|
||||
|
||||
RUN \
|
||||
echo "**** add mediaarea repository ****" && \
|
||||
curl -L \
|
||||
"https://mediaarea.net/repo/deb/repo-mediaarea_1.0-12_all.deb" \
|
||||
-o /tmp/key.deb && \
|
||||
dpkg -i /tmp/key.deb && \
|
||||
echo "deb https://mediaarea.net/repo/deb/ubuntu focal main" | tee /etc/apt/sources.list.d/mediaarea.list && \
|
||||
echo "**** install packages ****" && \
|
||||
apk add -U --upgrade --no-cache \
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
curl \
|
||||
jq \
|
||||
libmediainfo \
|
||||
sqlite-libs && \
|
||||
apk add -U --upgrade --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||
mono && \
|
||||
mediainfo && \
|
||||
echo "**** install sonarr ****" && \
|
||||
mkdir -p /app/sonarr/bin && \
|
||||
if [ -z ${SONARR_VERSION+x} ]; then \
|
||||
@@ -32,10 +37,12 @@ RUN \
|
||||
tar xzf \
|
||||
/tmp/sonarr.tar.gz -C \
|
||||
/app/sonarr/bin --strip-components=1 && \
|
||||
echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \
|
||||
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \
|
||||
rm -rf /app/sonarr/bin/Sonarr.Update && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/var/lib/apt/lists/* \
|
||||
/tmp/* \
|
||||
/var/tmp/*
|
||||
|
||||
|
||||
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -24,7 +24,7 @@ pipeline {
|
||||
DOCKERHUB_IMAGE = 'linuxserver/sonarr'
|
||||
DEV_DOCKERHUB_IMAGE = 'lsiodev/sonarr'
|
||||
PR_DOCKERHUB_IMAGE = 'lspipepr/sonarr'
|
||||
DIST_IMAGE = 'alpine'
|
||||
DIST_IMAGE = 'ubuntu'
|
||||
MULTIARCH='true'
|
||||
CI='true'
|
||||
CI_WEB='true'
|
||||
|
||||
@@ -236,6 +236,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **02.08.22:** - Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine.
|
||||
* **20.02.22:** - Rebase develop branch to Alpine.
|
||||
* **13.12.21:** - Switch strategy for mediainfo
|
||||
* **10.02.21:** - Rebase to mono focal baseimage. Switch to v3 nightlies.
|
||||
|
||||
@@ -15,7 +15,7 @@ repo_vars:
|
||||
- DOCKERHUB_IMAGE = 'linuxserver/sonarr'
|
||||
- DEV_DOCKERHUB_IMAGE = 'lsiodev/sonarr'
|
||||
- PR_DOCKERHUB_IMAGE = 'lspipepr/sonarr'
|
||||
- DIST_IMAGE = 'alpine'
|
||||
- DIST_IMAGE = 'ubuntu'
|
||||
- MULTIARCH='true'
|
||||
- CI='true'
|
||||
- CI_WEB='true'
|
||||
|
||||
@@ -44,7 +44,8 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }
|
||||
- { date: "02.08.22:", desc: "Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine." }
|
||||
- { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }
|
||||
- { date: "13.12.21:", desc: "Switch strategy for mediainfo" }
|
||||
- { date: "10.02.21:", desc: "Rebase to mono focal baseimage. Switch to v3 nightlies." }
|
||||
- { date: "18.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
|
||||
|
||||
@@ -4,13 +4,6 @@
|
||||
[[ -e /config/sonarr.pid ]] && \
|
||||
rm -rf /config/sonarr.pid
|
||||
|
||||
# update certs for mono
|
||||
if [[ ! -f "/app/sonarr/donecerts" ]]; then
|
||||
echo "*** Running mono cert sync ***"
|
||||
cert-sync --quiet /etc/ssl/certs/ca-certificates.crt
|
||||
touch "/app/sonarr/donecerts"
|
||||
fi
|
||||
|
||||
# permissions
|
||||
chown -R abc:abc \
|
||||
/app/sonarr/bin
|
||||
|
||||
0
root/etc/services.d/sonarr/run
Normal file → Executable file
0
root/etc/services.d/sonarr/run
Normal file → Executable file
Reference in New Issue
Block a user