Merge pull request #215 from linuxserver/mono-rebase
Rebase to focal mono base (6.12)
This commit is contained in:
+9
-2
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-mono:LTS
|
||||
FROM ghcr.io/linuxserver/baseimage-mono:focal
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -13,10 +13,17 @@ ENV XDG_CONFIG_HOME="/config/xdg"
|
||||
ENV SONARR_BRANCH="main"
|
||||
|
||||
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 ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
jq && \
|
||||
jq \
|
||||
mediainfo && \
|
||||
echo "**** install sonarr ****" && \
|
||||
mkdir -p /app/sonarr/bin && \
|
||||
if [ -z ${SONARR_VERSION+x} ]; then \
|
||||
|
||||
+9
-2
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-mono:arm64v8-LTS
|
||||
FROM ghcr.io/linuxserver/baseimage-mono:arm64v8-focal
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -13,10 +13,17 @@ ENV XDG_CONFIG_HOME="/config/xdg"
|
||||
ENV SONARR_BRANCH="main"
|
||||
|
||||
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 ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
jq && \
|
||||
jq \
|
||||
mediainfo && \
|
||||
echo "**** install sonarr ****" && \
|
||||
mkdir -p /app/sonarr/bin && \
|
||||
if [ -z ${SONARR_VERSION+x} ]; then \
|
||||
|
||||
+9
-2
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-mono:arm32v7-LTS
|
||||
FROM ghcr.io/linuxserver/baseimage-mono:arm32v7-focal
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -13,10 +13,17 @@ ENV XDG_CONFIG_HOME="/config/xdg"
|
||||
ENV SONARR_BRANCH="main"
|
||||
|
||||
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 ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
jq && \
|
||||
jq \
|
||||
mediainfo && \
|
||||
echo "**** install sonarr ****" && \
|
||||
mkdir -p /app/sonarr/bin && \
|
||||
if [ -z ${SONARR_VERSION+x} ]; then \
|
||||
|
||||
@@ -56,6 +56,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "28.04.22:", desc: "Rebase master branch to mono 6.12 base (focal)." }
|
||||
- { date: "20.02.22:", desc: "Rebase develop branch to Alpine, deprecate develop-alpine branch." }
|
||||
- { date: "28.12.21:", desc: "Add develop-alpine branch." }
|
||||
- { date: "11.05.21:", desc: "Make the paths clearer to the user." }
|
||||
|
||||
Reference in New Issue
Block a user