Compare commits

...

4 Commits

Author SHA1 Message Date
tobbenb
08b2a7c863 Fix path to binary 2020-09-24 20:23:58 +02:00
LinuxServer-CI
319ad73296 Bot Updating Package Versions 2020-09-24 14:32:00 +01:00
tobbenb
b93ccb80dc Remove multiarch 2020-09-24 15:06:37 +02:00
tobbenb
365dd117d3 Initial j0nny test branch commit 2020-09-24 00:27:03 +02:00
9 changed files with 1028 additions and 1321 deletions

View File

@@ -1,227 +1,4 @@
FROM lsiobase/alpine:3.12 as buildstage FROM lsiobase/ubuntu:bionic
############## build stage ##############
# package versions
ARG ARGTABLE_VER="2.13"
ARG XMLTV_VER="v0.6.1"
# environment settings
ARG TZ="Europe/Oslo"
ARG TVHEADEND_COMMIT
ENV HOME="/config"
# copy patches
COPY patches/ /tmp/patches/
RUN \
echo "**** install build packages ****" && \
apk add --no-cache \
autoconf \
automake \
bsd-compat-headers \
bzip2 \
cmake \
curl \
ffmpeg-dev \
file \
findutils \
g++ \
gcc \
gettext-dev \
git \
gnu-libiconv-dev \
gzip \
jq \
libcurl \
libdvbcsa-dev \
libgcrypt-dev \
libhdhomerun-dev \
libtool \
libva-dev \
libvpx-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
openssl-dev \
opus-dev \
patch \
pcre2-dev \
perl-archive-zip \
perl-boolean \
perl-capture-tiny \
perl-cgi \
perl-compress-raw-zlib \
perl-data-dumper \
perl-date-manip \
perl-datetime \
perl-datetime-format-strptime \
perl-datetime-timezone \
perl-dbd-sqlite \
perl-dbi \
perl-dev \
perl-digest-sha1 \
perl-doc \
perl-file-slurp \
perl-file-temp \
perl-file-which \
perl-getopt-long \
perl-html-parser \
perl-html-tree \
perl-http-cookies \
perl-io \
perl-io-compress \
perl-io-html \
perl-io-socket-ssl \
perl-io-stringy \
perl-json \
perl-json-xs \
perl-libwww \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
perl-parse-recdescent \
perl-path-class \
perl-scalar-list-utils \
perl-term-progressbar \
perl-term-readkey \
perl-test-exception \
perl-test-requires \
perl-timedate \
perl-try-tiny \
perl-unicode-string \
perl-xml-libxml \
perl-xml-libxslt \
perl-xml-parser \
perl-xml-sax \
perl-xml-treepp \
perl-xml-twig \
perl-xml-writer \
pkgconf \
pngquant \
python2 \
sdl-dev \
tar \
uriparser-dev \
wget \
x264-dev \
x265-dev \
zlib-dev
RUN \
echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
rm -rf /usr/include/iconv.h && \
cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
RUN \
echo "**** install perl modules for xmltv ****" && \
curl -L https://cpanmin.us | perl - App::cpanminus && \
cpanm --installdeps /tmp/patches
RUN \
echo "**** compile XMLTV ****" && \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \
echo "**** Fix test for xmltv alpine 3.11 ****" && \
patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
echo "**** Perl 5.26 fixes for XMTLV ****" && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
PERL5LIB=`pwd` && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make -j 2 && \
make test && \
make DESTDIR=/tmp/xmltv-build install
RUN \
echo "**** compile tvheadend ****" && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p \
/tmp/tvheadend && \
git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
./configure \
`#Encoding` \
--disable-ffmpeg_static \
--disable-libfdkaac_static \
--disable-libtheora_static \
--disable-libopus_static \
--disable-libvorbis_static \
--disable-libvpx_static \
--disable-libx264_static \
--disable-libx265_static \
--disable-libfdkaac \
--enable-libopus \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
\
`#Options` \
--disable-avahi \
--disable-dbus_1 \
--disable-bintray_cache \
--disable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-libav \
--enable-pngquant \
--enable-trace \
--enable-vaapi \
--infodir=/usr/share/info \
--localstatedir=/var \
--mandir=/usr/share/man \
--prefix=/usr \
--sysconfdir=/config && \
make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install
RUN \
echo "**** compile argtable2 ****" && \
ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
mkdir -p \
/tmp/argtable && \
curl -o \
/tmp/argtable-src.tar.gz -L \
"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
tar xf \
/tmp/argtable-src.tar.gz -C \
/tmp/argtable --strip-components=1 && \
cp /tmp/patches/config.* /tmp/argtable && \
cd /tmp/argtable && \
./configure \
--prefix=/usr && \
make -j 2 && \
make check && \
make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \
cp -pr /tmp/argtable-build/usr/* /usr/
RUN \
echo "***** compile comskip ****" && \
git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
cd /tmp/comskip && \
./autogen.sh && \
./configure \
--bindir=/usr/bin \
--sysconfdir=/config/comskip && \
make -j 2 && \
make DESTDIR=/tmp/comskip-build install
############## runtime stage ##############
FROM lsiobase/alpine:3.12
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -229,111 +6,174 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="saarg" LABEL maintainer="saarg"
# environment settings # package version
ENV HOME="/config" ARG TVH_VER="master"
ARG TVHEADEND_COMMIT
# Environment settings
ENV HOME="/config"
ARG DEBIAN_FRONTEND="noninteractive"
# add dependencies
RUN \ RUN \
echo "**** install runtime packages ****" && \ apt-get update && \
apk add --no-cache \ apt-get upgrade -qy && \
bsd-compat-headers \ apt-get install -qy --no-install-recommends \
autoconf \
automake \
binutils \
build-essential \
bzip2 \ bzip2 \
curl \ cmake \
ffmpeg \ dvb-apps \
ffmpeg-libs \ gettext \
gnu-libiconv \ git \
gzip \ gzip \
libcrypto1.1 \ jq \
libcurl \ libavahi-client-dev \
libdvbcsa \ libdvbcsa-dev \
libhdhomerun-libs \ libhdhomerun-dev \
libssl1.1 \ libiconv-hook-dev \
libva \ libssl-dev \
libva-intel-driver \ libtool \
mesa-dri-ati \ libva-dev \
libvpx \ pkg-config \
libxml2 \ python \
libxslt \ python3 \
linux-headers \ python3-requests \
openssl \
opus \
pcre2 \
perl \
perl-archive-zip \
perl-boolean \
perl-capture-tiny \
perl-cgi \
perl-compress-raw-zlib \
perl-data-dumper \
perl-date-manip \
perl-datetime \
perl-datetime-format-strptime \
perl-datetime-timezone \
perl-dbd-sqlite \
perl-dbi \
perl-digest-sha1 \
perl-doc \
perl-file-slurp \
perl-file-temp \
perl-file-which \
perl-getopt-long \
perl-html-parser \
perl-html-tree \
perl-http-cookies \
perl-io \
perl-io-compress \
perl-io-html \
perl-io-socket-ssl \
perl-io-stringy \
perl-json \
perl-json-xs \
perl-libwww \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
perl-parse-recdescent \
perl-path-class \
perl-scalar-list-utils \
perl-term-progressbar \
perl-term-readkey \
perl-test-exception \
perl-test-requires \
perl-timedate \
perl-try-tiny \
perl-unicode-string \
perl-xml-libxml \
perl-xml-libxslt \
perl-xml-parser \
perl-xml-sax \
perl-xml-treepp \
perl-xml-twig \
perl-xml-writer \
py3-requests \
python2 \
tar \
uriparser \
wget \ wget \
x264 \ zlib1g-dev && \
x265 \ echo "**** build tvheadend ****" && \
zlib && \ mkdir -p \
/tmp/patches && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
| jq -r '. | .sha'); \
fi && \
git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
curl -o \
/tmp/patches/1348.patch -L \
"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
curl -o \
/tmp/patches/1273.patch -L \
"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
patch -p1 -i /tmp/patches/1348.patch && \
patch -p1 -i /tmp/patches/1273.patch && \
./configure \
`#Encoding` \
--enable-ffmpeg_static \
--disable-libav \
\
`#Options` \
--disable-bintray_cache \
--enable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-pngquant \
--enable-trace \
--enable-vaapi && \
make && \
make install && \
echo "**** install dependencies for comskip ****" && \
apt-get install -qy --no-install-recommends \
libargtable2-dev \
libavformat-dev \
libbz2-dev \
libdca-dev \
libfaac-dev \
libfdk-aac-dev \
libmp3lame-dev \
libopencore-amrnb-dev \
libopencore-amrwb-dev \
libopus-dev \
libsdl1.2-dev \
libsoxr-dev \
libspeex-dev \
libva-dev \
libxvidcore-dev \
libvo-aacenc-dev \
libvorbisenc2 \
libvorbis-dev \
libvpx-dev \
libx264-dev \
libx265-dev && \
echo "**** build comskip ****" && \
git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
cd /tmp/comskip && \
./autogen.sh && \
./configure \
--bindir=/usr/bin \
--sysconfdir=/config/comskip && \
make && \
make install && \
echo "**** remove build dependencies ****" && \
apt autoremove && \
apt-get purge -qy --allow-remove-essential \
autoconf \
automake \
binutils \
build-essential \
cmake \
gettext \
git \
libargtable2-dev \
libavformat-dev \
libbz2-dev \
libdca-dev \
libfaac-dev \
libfdk-aac-dev \
libmp3lame-dev \
libopencore-amrnb-dev \
libopencore-amrwb-dev \
libopus-dev \
libsdl1.2-dev \
libsoxr-dev \
libspeex-dev \
libva-dev \
libxvidcore-dev \
libvo-aacenc-dev \
libvorbisenc2 \
libvorbis-dev \
libvpx-dev \
libx264-dev \
libx265-dev \
libavahi-client-dev \
libhdhomerun-dev \
libiconv-hook-dev \
libssl-dev \
libtool \
pkg-config \
python \
python3 \
python3-requests \
wget \
zlib1g-dev && \
echo "**** install runtime dependencies ****" && \
apt-get install -qy --no-install-recommends \
libargtable2-0 \
libavahi-client3 \
libavahi-common3 \
libc6 \
libdbus-1-3 \
libssl1.0.0 \
xmltv \
zlib1g && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/* && \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
/picons.tar.bz2 -L \ /picons.tar.bz2 -L \
https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
# copy local files and buildstage artifacts # copy local files
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
COPY root/ / COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9981 9982 EXPOSE 9981 9982
VOLUME /config VOLUME /config

View File

@@ -1,225 +1,4 @@
FROM lsiobase/alpine:arm64v8-3.12 as buildstage FROM lsiobase/ubuntu:arm64v8-bionic
############## build stage ##############
# package versions
ARG ARGTABLE_VER="2.13"
ARG XMLTV_VER="v0.6.1"
# environment settings
ARG TZ="Europe/Oslo"
ARG TVHEADEND_COMMIT
ENV HOME="/config"
# copy patches
COPY patches/ /tmp/patches/
RUN \
echo "**** install build packages ****" && \
apk add --no-cache \
autoconf \
automake \
bsd-compat-headers \
bzip2 \
cmake \
curl \
ffmpeg-dev \
file \
findutils \
g++ \
gcc \
gettext-dev \
git \
gnu-libiconv-dev \
gzip \
jq \
libcurl \
libdvbcsa-dev \
libgcrypt-dev \
libhdhomerun-dev \
libtool \
libvpx-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
openssl-dev \
opus-dev \
patch \
pcre2-dev \
perl-archive-zip \
perl-boolean \
perl-capture-tiny \
perl-cgi \
perl-compress-raw-zlib \
perl-data-dumper \
perl-date-manip \
perl-datetime \
perl-datetime-format-strptime \
perl-datetime-timezone \
perl-dbd-sqlite \
perl-dbi \
perl-dev \
perl-digest-sha1 \
perl-doc \
perl-file-slurp \
perl-file-temp \
perl-file-which \
perl-getopt-long \
perl-html-parser \
perl-html-tree \
perl-http-cookies \
perl-io \
perl-io-compress \
perl-io-html \
perl-io-socket-ssl \
perl-io-stringy \
perl-json \
perl-json-xs \
perl-libwww \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
perl-parse-recdescent \
perl-path-class \
perl-scalar-list-utils \
perl-term-progressbar \
perl-term-readkey \
perl-test-exception \
perl-test-requires \
perl-timedate \
perl-try-tiny \
perl-unicode-string \
perl-xml-libxml \
perl-xml-libxslt \
perl-xml-parser \
perl-xml-sax \
perl-xml-treepp \
perl-xml-twig \
perl-xml-writer \
pkgconf \
pngquant \
python2 \
sdl-dev \
tar \
uriparser-dev \
wget \
x264-dev \
x265-dev \
zlib-dev
RUN \
echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
rm -rf /usr/include/iconv.h && \
cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
RUN \
echo "**** install perl modules for xmltv ****" && \
curl -L https://cpanmin.us | perl - App::cpanminus && \
cpanm --installdeps /tmp/patches
RUN \
echo "**** compile XMLTV ****" && \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \
echo "**** Fix test for xmltv alpine 3.11 ****" && \
patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
echo "**** Perl 5.26 fixes for XMTLV ****" && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
PERL5LIB=`pwd` && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make -j 2 && \
make test && \
make DESTDIR=/tmp/xmltv-build install
RUN \
echo "**** compile tvheadend ****" && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p \
/tmp/tvheadend && \
git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
./configure \
`#Encoding` \
--disable-ffmpeg_static \
--disable-libfdkaac_static \
--disable-libtheora_static \
--disable-libopus_static \
--disable-libvorbis_static \
--disable-libvpx_static \
--disable-libx264_static \
--disable-libx265_static \
--disable-libfdkaac \
--enable-libopus \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
\
`#Options` \
--disable-avahi \
--disable-dbus_1 \
--disable-bintray_cache \
--disable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-libav \
--enable-pngquant \
--enable-trace \
--infodir=/usr/share/info \
--localstatedir=/var \
--mandir=/usr/share/man \
--prefix=/usr \
--sysconfdir=/config && \
make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install
RUN \
echo "**** compile argtable2 ****" && \
ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
mkdir -p \
/tmp/argtable && \
curl -o \
/tmp/argtable-src.tar.gz -L \
"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
tar xf \
/tmp/argtable-src.tar.gz -C \
/tmp/argtable --strip-components=1 && \
cp /tmp/patches/config.* /tmp/argtable && \
cd /tmp/argtable && \
./configure \
--prefix=/usr && \
make -j 2 && \
make check && \
make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \
cp -pr /tmp/argtable-build/usr/* /usr/
RUN \
echo "***** compile comskip ****" && \
git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
cd /tmp/comskip && \
./autogen.sh && \
./configure \
--bindir=/usr/bin \
--sysconfdir=/config/comskip && \
make -j 2 && \
make DESTDIR=/tmp/comskip-build install
############## runtime stage ##############
FROM lsiobase/alpine:arm64v8-3.12
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -227,108 +6,174 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="saarg" LABEL maintainer="saarg"
# environment settings # package version
ENV HOME="/config" ARG TVH_VER="master"
ARG TVHEADEND_COMMIT
# Environment settings
ENV HOME="/config"
ARG DEBIAN_FRONTEND="noninteractive"
# add dependencies
RUN \ RUN \
echo "**** install runtime packages ****" && \ apt-get update && \
apk add --no-cache \ apt-get upgrade -qy && \
bsd-compat-headers \ apt-get install -qy --no-install-recommends \
autoconf \
automake \
binutils \
build-essential \
bzip2 \ bzip2 \
curl \ cmake \
ffmpeg \ dvb-apps \
ffmpeg-libs \ gettext \
gnu-libiconv \ git \
gzip \ gzip \
libcrypto1.1 \ jq \
libcurl \ libavahi-client-dev \
libdvbcsa \ libdvbcsa-dev \
libhdhomerun-libs \ libhdhomerun-dev \
libssl1.1 \ libiconv-hook-dev \
libvpx \ libssl-dev \
libxml2 \ libtool \
libxslt \ libva-dev \
linux-headers \ pkg-config \
openssl \ python \
opus \ python3 \
pcre2 \ python3-requests \
perl \
perl-archive-zip \
perl-boolean \
perl-capture-tiny \
perl-cgi \
perl-compress-raw-zlib \
perl-data-dumper \
perl-date-manip \
perl-datetime \
perl-datetime-format-strptime \
perl-datetime-timezone \
perl-dbd-sqlite \
perl-dbi \
perl-digest-sha1 \
perl-doc \
perl-file-slurp \
perl-file-temp \
perl-file-which \
perl-getopt-long \
perl-html-parser \
perl-html-tree \
perl-http-cookies \
perl-io \
perl-io-compress \
perl-io-html \
perl-io-socket-ssl \
perl-io-stringy \
perl-json \
perl-json-xs \
perl-libwww \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
perl-parse-recdescent \
perl-path-class \
perl-scalar-list-utils \
perl-term-progressbar \
perl-term-readkey \
perl-test-exception \
perl-test-requires \
perl-timedate \
perl-try-tiny \
perl-unicode-string \
perl-xml-libxml \
perl-xml-libxslt \
perl-xml-parser \
perl-xml-sax \
perl-xml-treepp \
perl-xml-twig \
perl-xml-writer \
py3-requests \
python2 \
tar \
uriparser \
wget \ wget \
x264 \ zlib1g-dev && \
x265 \ echo "**** build tvheadend ****" && \
zlib && \ mkdir -p \
/tmp/patches && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
| jq -r '. | .sha'); \
fi && \
git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
curl -o \
/tmp/patches/1348.patch -L \
"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
curl -o \
/tmp/patches/1273.patch -L \
"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
patch -p1 -i /tmp/patches/1348.patch && \
patch -p1 -i /tmp/patches/1273.patch && \
./configure \
`#Encoding` \
--enable-ffmpeg_static \
--disable-libav \
\
`#Options` \
--disable-bintray_cache \
--enable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-pngquant \
--enable-trace \
--enable-vaapi && \
make && \
make install && \
echo "**** install dependencies for comskip ****" && \
apt-get install -qy --no-install-recommends \
libargtable2-dev \
libavformat-dev \
libbz2-dev \
libdca-dev \
libfaac-dev \
libfdk-aac-dev \
libmp3lame-dev \
libopencore-amrnb-dev \
libopencore-amrwb-dev \
libopus-dev \
libsdl1.2-dev \
libsoxr-dev \
libspeex-dev \
libva-dev \
libxvidcore-dev \
libvo-aacenc-dev \
libvorbisenc2 \
libvorbis-dev \
libvpx-dev \
libx264-dev \
libx265-dev && \
echo "**** build comskip ****" && \
git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
cd /tmp/comskip && \
./autogen.sh && \
./configure \
--bindir=/usr/bin \
--sysconfdir=/config/comskip && \
make && \
make install && \
echo "**** remove build dependencies ****" && \
apt autoremove && \
apt-get purge -qy --allow-remove-essential \
autoconf \
automake \
binutils \
build-essential \
cmake \
gettext \
git \
libargtable2-dev \
libavformat-dev \
libbz2-dev \
libdca-dev \
libfaac-dev \
libfdk-aac-dev \
libmp3lame-dev \
libopencore-amrnb-dev \
libopencore-amrwb-dev \
libopus-dev \
libsdl1.2-dev \
libsoxr-dev \
libspeex-dev \
libva-dev \
libxvidcore-dev \
libvo-aacenc-dev \
libvorbisenc2 \
libvorbis-dev \
libvpx-dev \
libx264-dev \
libx265-dev \
libavahi-client-dev \
libhdhomerun-dev \
libiconv-hook-dev \
libssl-dev \
libtool \
pkg-config \
python \
python3 \
python3-requests \
wget \
zlib1g-dev && \
echo "**** install runtime dependencies ****" && \
apt-get install -qy --no-install-recommends \
libargtable2-0 \
libavahi-client3 \
libavahi-common3 \
libc6 \
libdbus-1-3 \
libssl1.0.0 \
xmltv \
zlib1g && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/* && \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
/picons.tar.bz2 -L \ /picons.tar.bz2 -L \
https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
# copy local files and buildstage artifacts # copy local files
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
COPY root/ / COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9981 9982 EXPOSE 9981 9982
VOLUME /config VOLUME /config

View File

@@ -1,225 +1,4 @@
FROM lsiobase/alpine:arm32v7-3.12 as buildstage FROM lsiobase/ubuntu:arm32v7-bionic
############## build stage ##############
# package versions
ARG ARGTABLE_VER="2.13"
ARG XMLTV_VER="v0.6.1"
# environment settings
ARG TZ="Europe/Oslo"
ARG TVHEADEND_COMMIT
ENV HOME="/config"
# copy patches
COPY patches/ /tmp/patches/
RUN \
echo "**** install build packages ****" && \
apk add --no-cache \
autoconf \
automake \
bsd-compat-headers \
bzip2 \
cmake \
curl \
ffmpeg-dev \
file \
findutils \
g++ \
gcc \
gettext-dev \
git \
gnu-libiconv-dev \
gzip \
jq \
libcurl \
libdvbcsa-dev \
libgcrypt-dev \
libhdhomerun-dev \
libtool \
libvpx-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
openssl-dev \
opus-dev \
patch \
pcre2-dev \
perl-archive-zip \
perl-boolean \
perl-capture-tiny \
perl-cgi \
perl-compress-raw-zlib \
perl-data-dumper \
perl-date-manip \
perl-datetime \
perl-datetime-format-strptime \
perl-datetime-timezone \
perl-dbd-sqlite \
perl-dbi \
perl-dev \
perl-digest-sha1 \
perl-doc \
perl-file-slurp \
perl-file-temp \
perl-file-which \
perl-getopt-long \
perl-html-parser \
perl-html-tree \
perl-http-cookies \
perl-io \
perl-io-compress \
perl-io-html \
perl-io-socket-ssl \
perl-io-stringy \
perl-json \
perl-json-xs \
perl-libwww \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
perl-parse-recdescent \
perl-path-class \
perl-scalar-list-utils \
perl-term-progressbar \
perl-term-readkey \
perl-test-exception \
perl-test-requires \
perl-timedate \
perl-try-tiny \
perl-unicode-string \
perl-xml-libxml \
perl-xml-libxslt \
perl-xml-parser \
perl-xml-sax \
perl-xml-treepp \
perl-xml-twig \
perl-xml-writer \
pkgconf \
pngquant \
python2 \
sdl-dev \
tar \
uriparser-dev \
wget \
x264-dev \
x265-dev \
zlib-dev
RUN \
echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
rm -rf /usr/include/iconv.h && \
cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
RUN \
echo "**** install perl modules for xmltv ****" && \
curl -L https://cpanmin.us | perl - App::cpanminus && \
cpanm --installdeps /tmp/patches
RUN \
echo "**** compile XMLTV ****" && \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \
echo "**** Fix test for xmltv alpine 3.11 ****" && \
patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
echo "**** Perl 5.26 fixes for XMTLV ****" && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
PERL5LIB=`pwd` && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make -j 2 && \
make test && \
make DESTDIR=/tmp/xmltv-build install
RUN \
echo "**** compile tvheadend ****" && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p \
/tmp/tvheadend && \
git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
./configure \
`#Encoding` \
--disable-ffmpeg_static \
--disable-libfdkaac_static \
--disable-libtheora_static \
--disable-libopus_static \
--disable-libvorbis_static \
--disable-libvpx_static \
--disable-libx264_static \
--disable-libx265_static \
--disable-libfdkaac \
--enable-libopus \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
\
`#Options` \
--disable-avahi \
--disable-dbus_1 \
--disable-bintray_cache \
--disable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-libav \
--enable-pngquant \
--enable-trace \
--infodir=/usr/share/info \
--localstatedir=/var \
--mandir=/usr/share/man \
--prefix=/usr \
--sysconfdir=/config && \
make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install
RUN \
echo "**** compile argtable2 ****" && \
ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
mkdir -p \
/tmp/argtable && \
curl -o \
/tmp/argtable-src.tar.gz -L \
"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
tar xf \
/tmp/argtable-src.tar.gz -C \
/tmp/argtable --strip-components=1 && \
cp /tmp/patches/config.* /tmp/argtable && \
cd /tmp/argtable && \
./configure \
--prefix=/usr && \
make -j 2 && \
make check && \
make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \
cp -pr /tmp/argtable-build/usr/* /usr/
RUN \
echo "***** compile comskip ****" && \
git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
cd /tmp/comskip && \
./autogen.sh && \
./configure \
--bindir=/usr/bin \
--sysconfdir=/config/comskip && \
make -j 2 && \
make DESTDIR=/tmp/comskip-build install
############## runtime stage ##############
FROM lsiobase/alpine:arm32v7-3.12
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -227,108 +6,174 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="saarg" LABEL maintainer="saarg"
# environment settings # package version
ENV HOME="/config" ARG TVH_VER="master"
ARG TVHEADEND_COMMIT
# Environment settings
ENV HOME="/config"
ARG DEBIAN_FRONTEND="noninteractive"
# add dependencies
RUN \ RUN \
echo "**** install runtime packages ****" && \ apt-get update && \
apk add --no-cache \ apt-get upgrade -qy && \
bsd-compat-headers \ apt-get install -qy --no-install-recommends \
autoconf \
automake \
binutils \
build-essential \
bzip2 \ bzip2 \
curl \ cmake \
ffmpeg \ dvb-apps \
ffmpeg-libs \ gettext \
gnu-libiconv \ git \
gzip \ gzip \
libcrypto1.1 \ jq \
libcurl \ libavahi-client-dev \
libdvbcsa \ libdvbcsa-dev \
libhdhomerun-libs \ libhdhomerun-dev \
libssl1.1 \ libiconv-hook-dev \
libvpx \ libssl-dev \
libxml2 \ libtool \
libxslt \ libva-dev \
linux-headers \ pkg-config \
openssl \ python \
opus \ python3 \
pcre2 \ python3-requests \
perl \
perl-archive-zip \
perl-boolean \
perl-capture-tiny \
perl-cgi \
perl-compress-raw-zlib \
perl-data-dumper \
perl-date-manip \
perl-datetime \
perl-datetime-format-strptime \
perl-datetime-timezone \
perl-dbd-sqlite \
perl-dbi \
perl-digest-sha1 \
perl-doc \
perl-file-slurp \
perl-file-temp \
perl-file-which \
perl-getopt-long \
perl-html-parser \
perl-html-tree \
perl-http-cookies \
perl-io \
perl-io-compress \
perl-io-html \
perl-io-socket-ssl \
perl-io-stringy \
perl-json \
perl-json-xs \
perl-libwww \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
perl-parse-recdescent \
perl-path-class \
perl-scalar-list-utils \
perl-term-progressbar \
perl-term-readkey \
perl-test-exception \
perl-test-requires \
perl-timedate \
perl-try-tiny \
perl-unicode-string \
perl-xml-libxml \
perl-xml-libxslt \
perl-xml-parser \
perl-xml-sax \
perl-xml-treepp \
perl-xml-twig \
perl-xml-writer \
py3-requests \
python2 \
tar \
uriparser \
wget \ wget \
x264 \ zlib1g-dev && \
x265 \ echo "**** build tvheadend ****" && \
zlib && \ mkdir -p \
/tmp/patches && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
| jq -r '. | .sha'); \
fi && \
git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
curl -o \
/tmp/patches/1348.patch -L \
"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
curl -o \
/tmp/patches/1273.patch -L \
"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
patch -p1 -i /tmp/patches/1348.patch && \
patch -p1 -i /tmp/patches/1273.patch && \
./configure \
`#Encoding` \
--enable-ffmpeg_static \
--disable-libav \
\
`#Options` \
--disable-bintray_cache \
--enable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-pngquant \
--enable-trace \
--enable-vaapi && \
make && \
make install && \
echo "**** install dependencies for comskip ****" && \
apt-get install -qy --no-install-recommends \
libargtable2-dev \
libavformat-dev \
libbz2-dev \
libdca-dev \
libfaac-dev \
libfdk-aac-dev \
libmp3lame-dev \
libopencore-amrnb-dev \
libopencore-amrwb-dev \
libopus-dev \
libsdl1.2-dev \
libsoxr-dev \
libspeex-dev \
libva-dev \
libxvidcore-dev \
libvo-aacenc-dev \
libvorbisenc2 \
libvorbis-dev \
libvpx-dev \
libx264-dev \
libx265-dev && \
echo "**** build comskip ****" && \
git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
cd /tmp/comskip && \
./autogen.sh && \
./configure \
--bindir=/usr/bin \
--sysconfdir=/config/comskip && \
make && \
make install && \
echo "**** remove build dependencies ****" && \
apt autoremove && \
apt-get purge -qy --allow-remove-essential \
autoconf \
automake \
binutils \
build-essential \
cmake \
gettext \
git \
libargtable2-dev \
libavformat-dev \
libbz2-dev \
libdca-dev \
libfaac-dev \
libfdk-aac-dev \
libmp3lame-dev \
libopencore-amrnb-dev \
libopencore-amrwb-dev \
libopus-dev \
libsdl1.2-dev \
libsoxr-dev \
libspeex-dev \
libva-dev \
libxvidcore-dev \
libvo-aacenc-dev \
libvorbisenc2 \
libvorbis-dev \
libvpx-dev \
libx264-dev \
libx265-dev \
libavahi-client-dev \
libhdhomerun-dev \
libiconv-hook-dev \
libssl-dev \
libtool \
pkg-config \
python \
python3 \
python3-requests \
wget \
zlib1g-dev && \
echo "**** install runtime dependencies ****" && \
apt-get install -qy --no-install-recommends \
libargtable2-0 \
libavahi-client3 \
libavahi-common3 \
libc6 \
libdbus-1-3 \
libssl1.0.0 \
xmltv \
zlib1g && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/* && \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
/picons.tar.bz2 -L \ /picons.tar.bz2 -L \
https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
# copy local files and buildstage artifacts # copy local files
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
COPY root/ / COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9981 9982 EXPOSE 9981 9982
VOLUME /config VOLUME /config

82
Jenkinsfile vendored
View File

@@ -26,8 +26,8 @@ pipeline {
DOCKERHUB_IMAGE = 'linuxserver/tvheadend' DOCKERHUB_IMAGE = 'linuxserver/tvheadend'
DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend' DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend'
PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend' PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend'
DIST_IMAGE = 'alpine' DIST_IMAGE = 'ubuntu'
MULTIARCH='true' MULTIARCH='false'
CI='true' CI='true'
CI_WEB='true' CI_WEB='true'
CI_PORT='9981' CI_PORT='9981'
@@ -44,7 +44,7 @@ pipeline {
script{ script{
env.EXIT_STATUS = '' env.EXIT_STATUS = ''
env.LS_RELEASE = sh( env.LS_RELEASE = sh(
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':j0nny 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
returnStdout: true).trim() returnStdout: true).trim()
env.LS_RELEASE_NOTES = sh( env.LS_RELEASE_NOTES = sh(
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -129,10 +129,10 @@ pipeline {
} }
} }
} }
// If this is a master build use live docker endpoints // If this is a j0nny build use live docker endpoints
stage("Set ENV live build"){ stage("Set ENV live build"){
when { when {
branch "master" branch "j0nny"
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
} }
steps { steps {
@@ -152,7 +152,7 @@ pipeline {
// If this is a dev build use dev docker endpoints // If this is a dev build use dev docker endpoints
stage("Set ENV dev build"){ stage("Set ENV dev build"){
when { when {
not {branch "master"} not {branch "j0nny"}
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
} }
steps { steps {
@@ -223,7 +223,7 @@ pipeline {
// Use helper containers to render templated files // Use helper containers to render templated files
stage('Update-Templates') { stage('Update-Templates') {
when { when {
branch "master" branch "j0nny"
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
expression { expression {
env.CONTAINER_NAME != null env.CONTAINER_NAME != null
@@ -234,7 +234,7 @@ pipeline {
set -e set -e
TEMPDIR=$(mktemp -d) TEMPDIR=$(mktemp -d)
docker pull linuxserver/jenkins-builder:latest docker pull linuxserver/jenkins-builder:latest
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=j0nny -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
cd ${TEMPDIR}/docker-${CONTAINER_NAME} cd ${TEMPDIR}/docker-${CONTAINER_NAME}
NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -242,7 +242,7 @@ pipeline {
mkdir -p ${TEMPDIR}/repo mkdir -p ${TEMPDIR}/repo
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
cd ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO}
git checkout -f master git checkout -f j0nny
cd ${TEMPDIR}/docker-${CONTAINER_NAME} cd ${TEMPDIR}/docker-${CONTAINER_NAME}
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
@@ -274,7 +274,7 @@ pipeline {
// Exit the build if the Templated files were just updated // Exit the build if the Templated files were just updated
stage('Template-exit') { stage('Template-exit') {
when { when {
branch "master" branch "j0nny"
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
environment name: 'FILES_UPDATED', value: 'true' environment name: 'FILES_UPDATED', value: 'true'
expression { expression {
@@ -397,7 +397,7 @@ pipeline {
// Take the image we just built and dump package versions for comparison // Take the image we just built and dump package versions for comparison
stage('Update-packages') { stage('Update-packages') {
when { when {
branch "master" branch "j0nny"
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
environment name: 'EXIT_STATUS', value: '' environment name: 'EXIT_STATUS', value: ''
} }
@@ -425,7 +425,7 @@ pipeline {
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f j0nny
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
cd ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/
wait wait
@@ -449,7 +449,7 @@ pipeline {
// Exit the build if the package file was just updated // Exit the build if the package file was just updated
stage('PACKAGE-exit') { stage('PACKAGE-exit') {
when { when {
branch "master" branch "j0nny"
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'PACKAGE_UPDATED', value: 'true'
environment name: 'EXIT_STATUS', value: '' environment name: 'EXIT_STATUS', value: ''
@@ -463,7 +463,7 @@ pipeline {
// Exit the build if this is just a package check and there are no changes to push // Exit the build if this is just a package check and there are no changes to push
stage('PACKAGECHECK-exit') { stage('PACKAGECHECK-exit') {
when { when {
branch "master" branch "j0nny"
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'PACKAGE_UPDATED', value: 'false'
environment name: 'EXIT_STATUS', value: '' environment name: 'EXIT_STATUS', value: ''
@@ -552,8 +552,8 @@ pipeline {
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:j0nny
docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:j0nny
docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${META_TAG}
done done
''' '''
@@ -562,7 +562,7 @@ pipeline {
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
docker rmi \ docker rmi \
${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${META_TAG} \
${DELETEIMAGE}:latest || : ${DELETEIMAGE}:j0nny || :
done done
''' '''
} }
@@ -599,51 +599,51 @@ pipeline {
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-j0nny
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-j0nny
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-j0nny
docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker push ${MANIFESTIMAGE}:amd64-latest docker push ${MANIFESTIMAGE}:amd64-j0nny
docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm32v7-j0nny
docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:arm64v8-j0nny
docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest push --purge ${MANIFESTIMAGE}:j0nny || :
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest create ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:amd64-j0nny ${MANIFESTIMAGE}:arm32v7-j0nny ${MANIFESTIMAGE}:arm64v8-j0nny
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:arm32v7-j0nny --os linux --arch arm
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 docker manifest annotate ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:arm64v8-j0nny --os linux --arch arm64 --variant v8
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:j0nny
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
done done
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:j0nny
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-j0nny
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-j0nny
docker push ${GITHUBIMAGE}:amd64-${META_TAG} docker push ${GITHUBIMAGE}:amd64-${META_TAG}
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
docker push ${GITHUBIMAGE}:latest docker push ${GITHUBIMAGE}:j0nny
docker push ${GITHUBIMAGE}:${META_TAG} docker push ${GITHUBIMAGE}:${META_TAG}
docker push ${GITHUBIMAGE}:arm32v7-latest docker push ${GITHUBIMAGE}:arm32v7-j0nny
docker push ${GITHUBIMAGE}:arm64v8-latest docker push ${GITHUBIMAGE}:arm64v8-j0nny
''' '''
} }
sh '''#! /bin/bash sh '''#! /bin/bash
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
docker rmi \ docker rmi \
${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-${META_TAG} \
${DELETEIMAGE}:amd64-latest \ ${DELETEIMAGE}:amd64-j0nny \
${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \
${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-j0nny \
${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \
${DELETEIMAGE}:arm64v8-latest || : ${DELETEIMAGE}:arm64v8-j0nny || :
done done
docker rmi \ docker rmi \
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
@@ -655,7 +655,7 @@ pipeline {
// If this is a public release tag it in the LS Github // If this is a public release tag it in the LS Github
stage('Github-Tag-Push-Release') { stage('Github-Tag-Push-Release') {
when { when {
branch "master" branch "j0nny"
expression { expression {
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
} }
@@ -667,14 +667,14 @@ pipeline {
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"object": "'${COMMIT_SHA}'",\ "object": "'${COMMIT_SHA}'",\
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to j0nny",\
"type": "commit",\ "type": "commit",\
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
echo "Pushing New release for Tag" echo "Pushing New release for Tag"
sh '''#! /bin/bash sh '''#! /bin/bash
curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"target_commitish": "master",\ "target_commitish": "j0nny",\
"name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
printf '","draft": false,"prerelease": false}' >> releasebody.json printf '","draft": false,"prerelease": false}' >> releasebody.json
@@ -701,7 +701,7 @@ pipeline {
set -e set -e
TEMPDIR=$(mktemp -d) TEMPDIR=$(mktemp -d)
docker pull linuxserver/jenkins-builder:latest docker pull linuxserver/jenkins-builder:latest
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=j0nny -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
docker pull lsiodev/readme-sync docker pull lsiodev/readme-sync
docker run --rm=true \ docker run --rm=true \
-e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_USERNAME=$DOCKERUSER \

View File

@@ -32,7 +32,7 @@ Find us at:
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com") [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend)
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend)
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-tvheadend%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-tvheadend%2Fjob%2Fj0nny%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/j0nny/)
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Ftvheadend%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html) [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Ftvheadend%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html)
[Tvheadend](https://www.tvheadend.org/) works as a proxy server: is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources. [Tvheadend](https://www.tvheadend.org/) works as a proxy server: is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.
@@ -304,42 +304,4 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **02.06.20:** - Update to Alpine 3.12. * **24.09.20:** - Initial j0nny Release.
* **27.12.19:** - Add requests and perl-json-xs package.
* **27.12.19:** - Update to Alpine 3.11.
* **02.10.19:** - Improve permission fixing on render & dvb devices.
* **18.08.19:** - Add AMD drivers.
* **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb.
* **28.06.19:** - Rebasing to alpine 3.10.
* **27.03.19:** - Rebase to Alpine 3.9, fix init logic to only chown once.
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
* **01.03.19:** - Bump xmltv to 0.6.1.
* **28.02.19:** - add perl-lwp-useragent-determined.
* **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend.
* **14.02.19:** - Add picons path to config.
* **15.01.19:** - Add pipeline logic and multi arch.
* **12.09.18:** - Rebase to alpine 3.8 and use buildstage type build.
* **21.04.18:** - Add JSON::XS Perl package for grab_tv_huro.
* **24.03.18:** - Add dvbcsa package.
* **04.03.18:** - Use sourceforge master rather than mirror for xmltv.
* **22.02.18:** - Add lost libva-intel-driver.
* **21.02.18:** - Fix wrong version of iconv used.
* **18.02.18:** - Add vaapi support, some cleanup and dropping of deprecated options.
* **04.01.18:** - Deprecate cpu_core routine lack of scaling.
* **11.12.17:** - Rebase to alpine 3.7, linting fixes.
* **02.09.17:** - Add codec dependencies.
* **13.07.17:** - Increase uniformity across all archs.
* **08.07.17:** - Update README with full path for comskip.
* **02.07.17:** - Move to one branch for all 4.2 releases.
* **27.05.17:** - Rebase to alpine 3.6.
* **01.05.17:** - Update to tvheadend 4.2.1 stable.
* **18.04.17:** - Use repo version of gnu-libiconv rather than compiling.
* **09.04.17:** - Chain cpanm installs in one block and use --installdeps.
* **09.02.17:** - Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
* **07.02.17:** - Add variable to add additional runtime paramters.
* **05.02.17:** - Update to alpine 3.5 and change dvb-apps to only compile needed libs.
* **14.11.16:** - Add picons from picons.xyz to /picons folder and add info to README.
* **22.09.16:** - Fix broken tv_grab_wg, libs for xmltv and update README.
* **18.09.16:** - Update XMLTV to 0.5.68 and update README.
* **10.09.16:** - Add layer badges to README.
* **05.09.16:** - Initial Release.

View File

@@ -4,8 +4,8 @@
project_name: docker-tvheadend project_name: docker-tvheadend
external_type: github_commit external_type: github_commit
release_type: stable release_type: stable
release_tag: latest release_tag: j0nny
ls_branch: master ls_branch: j0nny
repo_vars: repo_vars:
- EXT_GIT_BRANCH = 'master' - EXT_GIT_BRANCH = 'master'
- EXT_USER = 'tvheadend' - EXT_USER = 'tvheadend'
@@ -17,8 +17,8 @@ repo_vars:
- DOCKERHUB_IMAGE = 'linuxserver/tvheadend' - DOCKERHUB_IMAGE = 'linuxserver/tvheadend'
- DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend' - DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend'
- PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend' - PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend'
- DIST_IMAGE = 'alpine' - DIST_IMAGE = 'ubuntu'
- MULTIARCH='true' - MULTIARCH='false'
- CI='true' - CI='true'
- CI_WEB='true' - CI_WEB='true'
- CI_PORT='9981' - CI_PORT='9981'

View File

@@ -1,255 +1,508 @@
alpine-baselayout-3.2.0-r7 adduser3.116ubuntu1
alpine-keys-2.2-r0 apt1.6.12ubuntu0.1
alsa-lib-1.2.2-r0 apt-utils1.6.12ubuntu0.1
aom-libs-1.0.0-r1 autotools-dev20180224.1
apk-tools-2.10.5-r1 base-files10.1ubuntu2.10
bash-5.0.17-r0 base-passwd3.5.44
brotli-libs-1.0.7-r5 bash4.4.18-2ubuntu1.2
bsd-compat-headers-0.7.2-r3 binutils-common2.30-21ubuntu1~18.04.4
busybox-1.31.1-r19 binutils-x86-64-linux-gnu2.30-21ubuntu1~18.04.4
bzip2-1.0.8-r1 bsdutils1:2.31.1-0.4ubuntu3.7
ca-certificates-20191127-r4 bzip21.0.6-8.1ubuntu0.2
ca-certificates-bundle-20191127-r4 ca-certificates20190110~18.04.1
coreutils-8.32-r0 cmake-data3.10.2-1ubuntu2.18.04.1
curl-7.69.1-r1 coreutils8.28-1ubuntu1
expat-2.2.9-r1 cpp4:7.4.0-1ubuntu2.3
ffmpeg-4.3.1-r0 cpp-77.5.0-3ubuntu1~18.04
ffmpeg-libs-4.3.1-r0 curl7.58.0-2ubuntu3.10
fontconfig-2.13.1-r2 dash0.5.8-2.10
freetype-2.10.2-r0 debconf1.5.66ubuntu1
fribidi-1.0.9-r0 debianutils4.8.4
fts-1.2.7-r1 diffutils1:3.6-1
gdbm-1.13-r1 dpkg1.19.0.5ubuntu2.3
gmp-6.2.0-r0 dtv-scan-tables0+git20171226.07b18ec-1
gnu-libiconv-1.15-r2 dvb-apps1.1.1+rev1500-1.2
gnutls-3.6.15-r0 e2fsprogs1.44.1-1ubuntu1.3
gzip-1.10-r0 fdisk2.31.1-0.4ubuntu3.7
lame-3.100-r0 file1:5.32-2ubuntu0.4
libacl-2.2.53-r0 findutils4.6.0+git+20170828-2
libass-0.14.0-r0 fontconfig2.12.6-0ubuntu2
libattr-2.4.48-r0 fontconfig-config2.12.6-0ubuntu2
libbsd-0.10.0-r0 fonts-dejavu-core2.37-1
libbz2-1.0.8-r1 gcc-7-base7.5.0-3ubuntu1~18.04
libc-utils-0.7.2-r3 gcc-8-base8.4.0-1ubuntu1~18.04
libcrypto1.1-1.1.1g-r0 gettext-base0.19.8.1-6ubuntu0.3
libcurl-7.69.1-r1 git-man1:2.17.1-1ubuntu0.7
libdav1d-0.7.0-r0 gpgv2.2.4-1ubuntu1.3
libdrm-2.4.102-r0 grep3.1-2build1
libdvbcsa-1.1.0-r1 gzip1.6-5ubuntu1
libelf-0.179-r0 hostname3.20
libffi-3.3-r2 init-system-helpers1.51
libgcc-9.3.0-r2 jq1.5+dfsg-2
libgcrypt-1.8.5-r0 krb5-locales1.16-2ubuntu0.1
libgpg-error-1.37-r0 libacl12.2.52-3build1
libhdhomerun-libs-20200225-r0 libalgorithm-c3-perl0.10-1
libidn-1.35-r0 libapt-inst2.01.6.12ubuntu0.1
libidn2-2.3.0-r0 libapt-pkg5.01.6.12ubuntu0.1
libintl-0.20.2-r0 libarchive133.2.2-3.1ubuntu0.6
libjpeg-turbo-2.0.5-r0 libarchive-zip-perl1.60-1ubuntu0.1
libogg-1.3.4-r0 libargtable2-013-1
libpciaccess-0.16-r0 libargtable2-docs13-1
libpng-1.6.37-r1 libasan47.5.0-3ubuntu1~18.04
libproc-3.3.16-r0 libasn1-8-heimdal7.5.0+dfsg-1
libssh-0.9.4-r1 libasound21.1.3-5ubuntu0.5
libssl1.1-1.1.1g-r0 libasound2-data1.1.3-5ubuntu0.5
libstdc++-9.3.0-r2 libasound2-dev1.1.3-5ubuntu0.5
libtasn1-4.16.0-r1 libasyncns00.8-6
libtheora-1.1.1-r14 libatomic18.4.0-1ubuntu1~18.04
libtls-standalone-2.9.1-r1 libattr11:2.4.47-2build1
libunistring-0.9.10-r0 libaudit11:2.8.2-1ubuntu1
liburiparser-0.9.3-r1 libaudit-common1:2.8.2-1ubuntu1
libuuid-2.35.2-r0 libavahi-client30.7-3.1ubuntu1.2
libva-2.7.1-r0 libavahi-common30.7-3.1ubuntu1.2
libva-intel-driver-2.4.0-r1 libavahi-common-data0.7-3.1ubuntu1.2
libvdpau-1.4-r0 libavahi-common-dev0.7-3.1ubuntu1.2
libvorbis-1.3.6-r2 libavutil557:3.4.8-0ubuntu0.2
libvpx-1.8.2-r0 libavutil-dev7:3.4.8-0ubuntu0.2
libx11-1.6.12-r0 libb-hooks-endofscope-perl0.21-1
libxau-1.0.9-r0 libb-hooks-op-check-perl0.22-1
libxcb-1.14-r1 libbinutils2.30-21ubuntu1~18.04.4
libxdmcp-1.1.3-r0 libblkid12.31.1-0.4ubuntu3.7
libxext-1.3.4-r0 libbluray21:1.0.2-3
libxfixes-5.0.3-r2 libbsd00.8.7-1ubuntu0.1
libxml2-2.9.10-r5 libbz2-1.01.0.6-8.1ubuntu0.2
libxshmfence-1.3-r0 libc62.27-3ubuntu1.2
libxslt-1.1.34-r0 libc6-dev2.27-3ubuntu1.2
linux-headers-5.4.5-r1 libcaca00.99.beta19-2ubuntu0.18.04.1
linux-pam-1.3.1-r4 libcairo21.15.10-2ubuntu0.1
llvm10-libs-10.0.0-r2 libcap-ng00.7.7-3.1
mesa-20.0.7-r0 libc-bin2.27-3ubuntu1.2
mesa-dri-ati-20.0.7-r0 libcc1-08.4.0-1ubuntu1~18.04
mesa-dri-classic-20.0.7-r0 libc-dev-bin2.27-3ubuntu1.2
mesa-dri-gallium-20.0.7-r0 libcgi-pm-perl4.38-1
mesa-glapi-20.0.7-r0 libcilkrts57.5.0-3ubuntu1~18.04
mesa-va-gallium-20.0.7-r0 libclass-c3-perl0.33-1
mesa-vdpau-gallium-20.0.7-r0 libclass-data-inheritable-perl0.08-2
musl-1.1.24-r9 libclass-factory-util-perl1.7-3
musl-utils-1.1.24-r9 libclass-inspector-perl1.32-1
ncurses-libs-6.2_p20200523-r0 libclass-method-modifiers-perl2.12-1
ncurses-terminfo-base-6.2_p20200523-r0 libclass-singleton-perl1.5-1
nettle-3.5.1-r1 libcom-err21.44.1-1ubuntu1.3
nghttp2-libs-1.41.0-r0 libconvert-binhex-perl1.125-1
openssl-1.1.1g-r0 libcroco30.6.12-2
opus-1.3.1-r0 libcrystalhd31:0.0~git20110715.fdd2f19-12
p11-kit-0.23.20-r5 libcurl3-gnutls7.58.0-2ubuntu3.10
pcre2-10.35-r0 libcurl47.58.0-2ubuntu3.10
perl-5.30.3-r0 libdata-dump-perl1.23-1
perl-archive-zip-1.68-r0 libdata-optlist-perl0.110-1
perl-b-hooks-endofscope-0.24-r1 libdate-manip-perl6.60-1
perl-boolean-0.46-r1 libdatetime-format-builder-perl0.8100-1
perl-canary-stability-2013-r0 libdatetime-format-iso8601-perl0.08-2
perl-capture-tiny-0.48-r1 libdatetime-format-sqlite-perl0.11-2
perl-cgi-4.47-r0 libdatetime-format-strptime-perl1.7500-1
perl-class-data-inheritable-0.08-r1 libdatetime-locale-perl1:1.17-1
perl-class-inspector-1.36-r1 libdatetime-perl2:1.46-1
perl-class-methodmaker-2.24-r6 libdatetime-timezone-perl1:2.18-1+2018d
perl-class-singleton-1.5-r1 libdatrie10.2.10-7
perl-common-sense-3.75-r0 libdb5.35.3.28-13.1ubuntu1.1
perl-compress-raw-bzip2-2.093-r1 libdbd-sqlite3-perl1.56-1
perl-compress-raw-zlib-2.093-r1 libdbi-perl1.640-1ubuntu0.2
perl-cpan-meta-check-0.014-r1 libdbus-1-31.12.2-1ubuntu1.2
perl-data-dumper-2.173-r3 libdca00.0.5-10
perl-date-manip-6.81-r0 libdebconfclient00.213ubuntu1
perl-datetime-1.52-r0 libdevel-callchecker-perl0.007-2build1
perl-datetime-format-strptime-1.77-r0 libdevel-stacktrace-perl2.0300-1
perl-datetime-locale-1.25-r0 libdpkg-perl1.19.0.5ubuntu2.3
perl-datetime-timezone-2.39-r0 libdrm22.4.101-2~18.04.1
perl-dbd-sqlite-1.64-r2 libdrm-amdgpu12.4.101-2~18.04.1
perl-dbi-1.643-r0 libdrm-common2.4.101-2~18.04.1
perl-devel-stacktrace-2.04-r1 libdrm-dev2.4.101-2~18.04.1
perl-devel-symdump-2.18-r1 libdrm-intel12.4.101-2~18.04.1
perl-digest-sha1-2.13-r12 libdrm-nouveau22.4.101-2~18.04.1
perl-dist-checkconflicts-0.11-r1 libdrm-radeon12.4.101-2~18.04.1
perl-doc-5.30.3-r0 libdvbcsa11.1.0-2
perl-encode-locale-1.05-r2 libdvbcsa-dev1.1.0-2
perl-eval-closure-0.14-r1 libdynaloader-functions-perl0.003-1
perl-exception-class-1.44-r1 libedit23.1-20170329-1
perl-exporter-tiny-1.002002-r0 libegl11.0.0-2ubuntu2.3
perl-file-listing-6.04-r2 libegl-mesa020.0.8-0ubuntu1~18.04.1
perl-file-sharedir-1.116-r1 libelf10.170-0.4ubuntu0.1
perl-file-sharedir-install-0.13-r1 libencode-locale-perl1.05-1
perl-file-slurp-9999.30-r0 liberror-perl0.17025-1
perl-file-temp-0.2309-r1 libeval-closure-perl0.14-1
perl-file-which-1.23-r1 libexception-class-perl1.44-1
perl-getopt-long-2.51-r1 libexpat12.2.5-3ubuntu0.2
perl-html-parser-3.72-r5 libexporter-tiny-perl1.000000-2
perl-html-tagset-3.20-r2 libext2fs21.44.1-1ubuntu1.3
perl-html-tree-5.07-r1 libfaac01.29.7.7-1
perl-http-cookies-6.08-r0 libfcgi-perl0.78-2build1
perl-http-daemon-6.10-r0 libfdisk12.31.1-0.4ubuntu3.7
perl-http-date-6.05-r0 libfdk-aac10.1.5-1
perl-http-message-6.24-r0 libffi63.2.1-8
perl-http-negotiate-6.01-r2 libfile-chdir-perl0.1008-1
perl-importer-0.025-r0 libfile-homedir-perl1.002-1
perl-io-1.42-r0 libfile-listing-perl6.04-1
perl-io-compress-2.093-r0 libfile-sharedir-perl1.104-1
perl-io-html-1.001-r2 libfile-slurp-perl9999.19-6
perl-io-socket-ssl-2.068-r0 libfile-which-perl1.21-1
perl-io-stringy-2.113-r0 libflac81.3.2-1
perl-ipc-run3-0.048-r1 libfontconfig12.12.6-0ubuntu2
perl-json-4.02-r0 libfreetype62.8.1-2ubuntu2
perl-json-xs-4.02-r1 libfribidi00.19.7-2
perl-libwww-6.44-r0 libgbm120.0.8-0ubuntu1~18.04.1
perl-lingua-en-numbers-ordinate-1.04-r2 libgcc11:8.4.0-1ubuntu1~18.04
perl-lingua-preferred-0.2.4-r2 libgcc-7-dev7.5.0-3ubuntu1~18.04
perl-list-moreutils-0.428-r0 libgcrypt201.8.1-4ubuntu1.2
perl-list-moreutils-xs-0.428-r3 libgdbm51.14.1-6
perl-lwp-mediatypes-6.04-r0 libgdbm-compat41.14.1-6
perl-lwp-useragent-determined-1.07-r1 libgdk-pixbuf2.0-02.36.11-2
perl-module-build-0.4231-r0 libgdk-pixbuf2.0-common2.36.11-2
perl-module-implementation-0.09-r2 libgl11.0.0-2ubuntu2.3
perl-module-metadata-1.000037-r0 libgl1-mesa-dev20.0.8-0ubuntu1~18.04.1
perl-module-pluggable-5.2-r1 libgl1-mesa-dri20.0.8-0ubuntu1~18.04.1
perl-module-runtime-0.016-r3 libglapi-mesa20.0.8-0ubuntu1~18.04.1
perl-mro-compat-0.13-r1 libgles11.0.0-2ubuntu2.3
perl-namespace-autoclean-0.29-r1 libgles21.0.0-2ubuntu2.3
perl-namespace-clean-0.27-r1 libglib2.0-02.56.4-0ubuntu0.18.04.6
perl-net-http-6.19-r0 libglib2.0-bin2.56.4-0ubuntu0.18.04.6
perl-net-libidn-0.12-r8 libglib2.0-data2.56.4-0ubuntu0.18.04.6
perl-net-ssleay-1.88-r0 libglu1-mesa9.0.0-2.1build1
perl-package-deprecationmanager-0.17-r1 libglu1-mesa-dev9.0.0-2.1build1
perl-package-stash-0.38-r2 libglvnd01.0.0-2ubuntu2.3
perl-package-stash-xs-0.29-r3 libglvnd-core-dev1.0.0-2ubuntu2.3
perl-params-util-1.07-r8 libglvnd-dev1.0.0-2ubuntu2.3
perl-params-validate-1.29-r3 libglx01.0.0-2ubuntu2.3
perl-params-validationcompiler-0.30-r0 libglx-mesa020.0.8-0ubuntu1~18.04.1
perl-parse-recdescent-1.967015-r2 libgme00.6.2-1
perl-path-class-0.37-r1 libgmp102:6.1.2+dfsg-2
perl-pod-coverage-0.23-r1 libgnutls303.5.18-1ubuntu1.4
perl-role-tiny-2.001004-r0 libgomp18.4.0-1ubuntu1~18.04
perl-scalar-list-utils-1.55-r0 libgpg-error01.27-6
perl-scope-guard-0.21-r1 libgraphite2-31.3.11-2
perl-specio-0.46-r0 libgsm11.0.13-4build1
perl-sub-exporter-progressive-0.001013-r1 libgssapi3-heimdal7.5.0+dfsg-1
perl-sub-identify-0.14-r4 libgssapi-krb5-21.16-2ubuntu0.1
perl-sub-info-0.002-r1 libharfbuzz0b1.7.2-1ubuntu1
perl-sub-install-0.928-r1 libhcrypto4-heimdal7.5.0+dfsg-1
perl-sub-name-0.26-r1 libhdhomerun420180327-1
perl-sub-quote-2.006006-r0 libheimbase1-heimdal7.5.0+dfsg-1
perl-sub-uplevel-0.2800-r1 libheimntlm0-heimdal7.5.0+dfsg-1
perl-term-progressbar-2.22-r1 libhogweed43.4-1
perl-term-readkey-2.38-r3 libhtml-form-perl6.03-1
perl-term-table-0.015-r0 libhtml-parser-perl3.72-3build1
perl-test-exception-0.43-r1 libhtml-tableextract-perl2.15-1
perl-test-fatal-0.014-r2 libhtml-tagset-perl3.20-3
perl-test-needs-0.002006-r0 libhtml-tree-perl5.07-1
perl-test-pod-1.52-r1 libhttp-cache-transparent-perl1.1-1
perl-test-requires-0.11-r0 libhttp-cookies-perl6.04-1
perl-test-simple-1.302175-r0 libhttp-daemon-perl6.01-1
perl-test-taint-1.08-r2 libhttp-date-perl6.02-1
perl-test-warnings-0.030-r0 libhttp-message-perl6.14-1
perl-test-without-module-0.20-r1 libhttp-negotiate-perl6.00-2
perl-test2-plugin-nowarnings-0.08-r1 libhttp-server-simple-perl0.52-1
perl-test2-suite-0.000129-r0 libhx509-5-heimdal7.5.0+dfsg-1
perl-timedate-2.33-r0 libiconv-hook10.0.20021209-11
perl-try-tiny-0.30-r1 libicu6060.2-3ubuntu3.1
perl-types-serialiser-1.0-r2 libidn2-02.0.4-1.1ubuntu0.2
perl-unicode-string-2.10-r1 libio-html-perl1.001-1
perl-uri-1.76-r0 libio-sessiondata-perl1.03-1
perl-variable-magic-0.62-r3 libio-socket-ssl-perl2.060-3~ubuntu18.04.1
perl-www-robotrules-6.02-r2 libio-stringy-perl2.111-2
perl-xml-libxml-2.0205-r0 libisl190.19-1
perl-xml-libxslt-1.99-r0 libitm18.4.0-1ubuntu1~18.04
perl-xml-namespacesupport-1.12-r1 libjbig02.1-3.1build1
perl-xml-parser-2.46-r0 libjpeg88c-2ubuntu8
perl-xml-sax-1.02-r0 libjpeg-turbo81.5.2-0ubuntu5.18.04.4
perl-xml-sax-base-1.09-r1 libjq11.5+dfsg-2
perl-xml-treepp-0.43-r2 libjsoncpp11.7.4-3
perl-xml-twig-3.52-r2 libjson-perl2.97001-1
perl-xml-writer-0.625-r3 libk5crypto31.16-2ubuntu0.1
perl-yaml-syck-1.32-r0 libkeyutils11.5.9-9.2ubuntu2
procps-3.3.16-r0 libkrb5-26-heimdal7.5.0+dfsg-1
py3-appdirs-1.4.4-r1 libkrb5-31.16-2ubuntu0.1
py3-certifi-2020.4.5.1-r0 libkrb5support01.16-2ubuntu0.1
py3-chardet-3.0.4-r4 libldap-2.4-22.4.45+dfsg-1ubuntu1.6
py3-idna-2.9-r0 libldap-common2.4.45+dfsg-1ubuntu1.6
py3-ordered-set-4.0.1-r0 liblist-moreutils-perl0.416-1build3
py3-packaging-20.4-r0 libllvm101:10.0.0-4ubuntu1~18.04.2
py3-parsing-2.4.7-r0 liblsan08.4.0-1ubuntu1~18.04
py3-requests-2.23.0-r0 liblwp-mediatypes-perl6.02-1
py3-setuptools-47.0.0-r0 liblwp-protocol-https-perl6.07-2
py3-six-1.15.0-r0 liblwp-useragent-determined-perl1.07-1
py3-urllib3-1.25.9-r0 liblz4-10.0~r131-2ubuntu3
python2-2.7.18-r0 liblzma55.2.2-1.3
python3-3.8.5-r0 liblzo2-22.08-1.2
readline-8.0.4-r0 libmagic11:5.32-2ubuntu0.4
scanelf-1.2.6-r0 libmagic-mgc1:5.32-2ubuntu0.4
sdl2-2.0.12-r1 libmailtools-perl2.18-1
shadow-4.8.1-r0 libmime-tools-perl5.509-1
sqlite-libs-3.32.1-r0 libmodule-implementation-perl0.09-1
ssl_client-1.31.1-r19 libmodule-runtime-perl0.016-1
tar-1.32-r1 libmount12.31.1-0.4ubuntu3.7
tzdata-2020a-r0 libmp3lame03.100-2
uriparser-0.9.3-r1 libmpc31.1.0-1
v4l-utils-libs-1.20.0-r0 libmpdec22.4.2-1ubuntu1
wayland-libs-client-1.18.0-r4 libmpfr64.0.1-1
wget-1.20.3-r1 libmpg123-01.25.10-1
x264-20191119-r1 libmpx28.4.0-1ubuntu1~18.04
x264-libs-20191119-r1 libmro-compat-perl0.13-1
x265-3.3-r1 libnamespace-autoclean-perl0.28-1
x265-libs-3.3-r1 libnamespace-clean-perl0.27-1
xvidcore-1.3.7-r1 libncurses56.1-1ubuntu1.18.04
xz-5.2.5-r0 libncursesw56.1-1ubuntu1.18.04
xz-libs-5.2.5-r0 libnet-http-perl6.17-1
zlib-1.2.11-r3 libnet-smtp-ssl-perl1.04-1
zstd-libs-1.4.5-r0 libnet-ssleay-perl1.84-1ubuntu0.2
libnettle63.4-1
libnghttp2-141.30.0-1ubuntu1
libnuma12.0.11-2.1ubuntu0.1
libogg01.3.2-1
libogg-dev1.3.2-1
libonig46.7.0-1
libopencore-amrnb00.1.3-2.1
libopencore-amrwb00.1.3-2.1
libopengl01.0.0-2ubuntu2.3
libopenjp2-72.3.0-2build0.18.04.1
libopenmpt00.3.6-1
libopus01.1.2-1ubuntu1
libossp-uuid161.6.2-1.5build4
libossp-uuid-perl1.6.2-1.5build4
libp11-kit00.23.9-2
libpackage-deprecationmanager-perl0.17-1
libpackage-stash-perl0.37-1
libpam0g1.1.8-3.6ubuntu2.18.04.2
libpam-modules1.1.8-3.6ubuntu2.18.04.2
libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2
libpam-runtime1.1.8-3.6ubuntu2.18.04.2
libpango-1.0-01.40.14-1ubuntu0.1
libpangocairo-1.0-01.40.14-1ubuntu0.1
libpangoft2-1.0-01.40.14-1ubuntu0.1
libparams-classify-perl0.015-1
libparams-util-perl1.07-3build3
libparams-validate-perl1.29-1
libparams-validationcompiler-perl0.26-1
libparse-recdescent-perl1.967015+dfsg-2
libpciaccess00.14-1
libpcre16-32:8.39-9
libpcre32-32:8.39-9
libpcre32:8.39-9
libpcre3-dev2:8.39-9
libpcrecpp0v52:8.39-9
libperl5.265.26.1-6ubuntu0.3
libpixman-1-00.34.0-2
libpng16-161.6.34-1ubuntu0.18.04.2
libprocps62:3.3.12-3ubuntu1.2
libpsl50.19.1-5build1
libpthread-stubs0-dev0.3-4
libpython2.7-minimal2.7.17-1~18.04ubuntu1.1
libpython2.7-stdlib2.7.17-1~18.04ubuntu1.1
libpython3.6-minimal3.6.9-1~18.04ubuntu1.1
libpython3.6-stdlib3.6.9-1~18.04ubuntu1.1
libpython3-stdlib3.6.7-1~18.04
libpython-stdlib2.7.15~rc1-1
libquadmath08.4.0-1ubuntu1~18.04
libreadline77.0-3
librhash01.3.6-2
libroken18-heimdal7.5.0+dfsg-1
librole-tiny-perl2.000006-1
librsvg2-22.40.20-2ubuntu0.2
librtmp12.4+20151223.gitfa8646d.1-1
libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1
libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1
libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1
libseccomp22.4.3-1ubuntu3.18.04.3
libselinux12.7-2build2
libsemanage12.7-2build2
libsemanage-common2.7-2build2
libsensors41:3.4.0-4
libsepol12.7-1
libset-scalar-perl1.29-2
libshine33.1.1-1
libsigsegv22.12-1
libslang22.3.1a-3ubuntu1
libsmartcols12.31.1-0.4ubuntu3.7
libsnappy1v51.1.7-1
libsoap-lite-perl1.26-1
libsoxr00.1.2-3
libsoxr-lsr00.1.2-3
libspecio-perl0.42-1
libspeex11.2~rc1.2-1ubuntu2
libsqlite3-03.22.0-1ubuntu0.4
libss21.44.1-1ubuntu1.3
libssh-gcrypt-40.8.0~20170825.94fa1e38-1ubuntu0.7
libssl1.0.01.0.2n-1ubuntu5.4
libssl1.11.1.1-1ubuntu2.1~18.04.6
libstdc++68.4.0-1ubuntu1~18.04
libstdc++-7-dev7.5.0-3ubuntu1~18.04
libsub-exporter-perl0.987-1
libsub-exporter-progressive-perl0.001013-1
libsub-identify-perl0.14-1
libsub-install-perl0.928-1
libsub-name-perl0.21-1build1
libsub-quote-perl2.005000-1
libswresample27:3.4.8-0ubuntu0.2
libswresample-dev7:3.4.8-0ubuntu0.2
libsystemd0237-3ubuntu10.42
libtask-weaken-perl1.05-1
libtasn1-64.13-2
libterm-readkey-perl2.37-1build1
libtext-bidi-perl2.12-1build1
libtext-iconv-perl1.7-5build6
libthai00.1.27-2
libthai-data0.1.27-2
libtheora01.1.1+dfsg.1-14
libtiff54.0.9-5ubuntu0.3
libtimedate-perl2.3000-2
libtinfo56.1-1ubuntu1.18.04
libtk-tablematrix-perl1.23-6.1build4
libtry-tiny-perl0.30-1
libtsan08.4.0-1ubuntu1~18.04
libtwolame00.3.13-3
libubsan07.5.0-3ubuntu1~18.04
libudev1237-3ubuntu10.42
libunistring20.9.9-0ubuntu2
liburi-perl1.73-1
libuuid12.31.1-0.4ubuntu3.7
libuv11.18.0-3
libva22.1.0-3
libva-drm22.1.0-3
libva-glx22.1.0-3
libvariable-magic-perl0.62-1
libva-wayland22.1.0-3
libva-x11-22.1.0-3
libvdpau11.1.1-3ubuntu1
libvo-aacenc00.1.3-1
libvorbis0a1.3.5-4.2
libvorbisfile31.3.5-4.2
libvpx51.7.0-3ubuntu0.18.04.1
libwavpack15.1.0-2ubuntu1.4
libwayland-bin1.16.0-1ubuntu1.1~18.04.3
libwayland-client01.16.0-1ubuntu1.1~18.04.3
libwayland-cursor01.16.0-1ubuntu1.1~18.04.3
libwayland-dev1.16.0-1ubuntu1.1~18.04.3
libwayland-egl11.16.0-1ubuntu1.1~18.04.3
libwayland-server01.16.0-1ubuntu1.1~18.04.3
libwebp60.6.1-2
libwebpmux30.6.1-2
libwind0-heimdal7.5.0+dfsg-1
libwrap07.6.q-27
libwww-mechanize-perl1.86-1
libwww-perl6.31-1ubuntu0.1
libwww-robotrules-perl6.01-1
libx11-62:1.6.4-3ubuntu0.3
libx11-data2:1.6.4-3ubuntu0.3
libx11-dev2:1.6.4-3ubuntu0.3
libx11-xcb12:1.6.4-3ubuntu0.3
libx11-xcb-dev2:1.6.4-3ubuntu0.3
libx264-1522:0.152.2854+gite9a5903-2
libx265-1462.6-3
libxau61:1.0.8-1ubuntu1
libxau-dev1:1.0.8-1ubuntu1
libxcb11.13-2~ubuntu18.04
libxcb1-dev1.13-2~ubuntu18.04
libxcb-dri2-01.13-2~ubuntu18.04
libxcb-dri2-0-dev1.13-2~ubuntu18.04
libxcb-dri3-01.13-2~ubuntu18.04
libxcb-dri3-dev1.13-2~ubuntu18.04
libxcb-glx01.13-2~ubuntu18.04
libxcb-glx0-dev1.13-2~ubuntu18.04
libxcb-present01.13-2~ubuntu18.04
libxcb-present-dev1.13-2~ubuntu18.04
libxcb-randr01.13-2~ubuntu18.04
libxcb-randr0-dev1.13-2~ubuntu18.04
libxcb-render01.13-2~ubuntu18.04
libxcb-render0-dev1.13-2~ubuntu18.04
libxcb-shape01.13-2~ubuntu18.04
libxcb-shape0-dev1.13-2~ubuntu18.04
libxcb-shm01.13-2~ubuntu18.04
libxcb-sync11.13-2~ubuntu18.04
libxcb-sync-dev1.13-2~ubuntu18.04
libxcb-xfixes01.13-2~ubuntu18.04
libxcb-xfixes0-dev1.13-2~ubuntu18.04
libxdamage11:1.1.4-3
libxdamage-dev1:1.1.4-3
libxdmcp61:1.1.2-3
libxdmcp-dev1:1.1.2-3
libxext62:1.3.3-1
libxext-dev2:1.3.3-1
libxfixes31:5.0.3-1
libxfixes-dev1:5.0.3-1
libxft22.3.2-1
libxml22.9.4+dfsg1-6.1ubuntu1.3
libxml-dom-perl1.44-2
libxml-libxml-perl2.0128+dfsg-5
libxml-libxslt-perl1.95-1build2
libxml-namespacesupport-perl1.12-1
libxml-parser-perl2.44-2build3
libxml-perl0.08-2
libxml-regexp-perl0.04-1
libxml-sax-base-perl1.09-1
libxml-sax-perl0.99+dfsg-2ubuntu1
libxml-treepp-perl0.43-1
libxmltv-perl0.5.70-1
libxml-twig-perl1:3.50-1
libxml-writer-perl0.625-1
libxrender11:0.9.10-1
libxshmfence11.3-1
libxshmfence-dev1.3-1
libxslt1.11.1.29-5ubuntu0.2
libxvidcore42:1.3.5-1
libxxf86vm11:1.1.4-1
libxxf86vm-dev1:1.1.4-1
libzstd11.3.3+dfsg-2ubuntu1.1
libzvbi00.2.35-13
libzvbi-common0.2.35-13
linux-libc-dev4.15.0-118.119
locales2.27-3ubuntu1.2
login1:4.5-1ubuntu2
lsb-base9.20170808ubuntu1
m41.4.18-1
make4.1-9.1ubuntu1
makedev2.3.1-93ubuntu2
mawk1.3.3-17ubuntu3
mesa-common-dev20.0.8-0ubuntu1~18.04.1
mime-support3.60ubuntu1
mount2.31.1-0.4ubuntu3.7
multiarch-support2.27-3ubuntu1.2
ncurses-base6.1-1ubuntu1.18.04
ncurses-bin6.1-1ubuntu1.18.04
netbase5.4
openssl1.1.1-1ubuntu2.1~18.04.6
passwd1:4.5-1ubuntu2
patch2.7.6-2ubuntu1.1
perl5.26.1-6ubuntu0.3
perl-base5.26.1-6ubuntu0.3
perl-modules-5.265.26.1-6ubuntu0.3
perl-openssl-defaults3build1
perl-tk1:804.033-2build1
procps2:3.3.12-3ubuntu1.2
publicsuffix20180223.1310-1
python2.72.7.17-1~18.04ubuntu1.1
python2.7-minimal2.7.17-1~18.04ubuntu1.1
python3.63.6.9-1~18.04ubuntu1.1
python3.6-minimal3.6.9-1~18.04ubuntu1.1
python3-minimal3.6.7-1~18.04
python-minimal2.7.15~rc1-1
readline-common7.0-3
sed4.4-2
sensible-utils0.0.12
shared-mime-info1.9-2
sysvinit-utils2.88dsf-59.10ubuntu1
tar1.29b-2ubuntu0.1
tzdata2020a-0ubuntu0.18.04
ubuntu-keyring2018.09.18.1~18.04.0
ucf3.0038
util-linux2.31.1-0.4ubuntu3.7
x11proto-core-dev2018.4-4
x11proto-damage-dev1:2018.4-4
x11proto-dev2018.4-4
x11proto-fixes-dev1:2018.4-4
x11proto-xext-dev2018.4-4
x11proto-xf86vidmode-dev2018.4-4
xmltv0.5.70-1
xmltv-gui0.5.70-1
xmltv-util0.5.70-1
xorg-sgml-doctools1:1.11-1
xtrans-dev1.3.5-1
xz-utils5.2.2-1.3
zlib1g1:1.2.11.dfsg-0ubuntu2

View File

@@ -126,42 +126,4 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "02.06.20:", desc: "Update to Alpine 3.12." } - { date: "24.09.20:", desc: "Initial j0nny Release." }
- { date: "27.12.19:", desc: "Add requests and perl-json-xs package." }
- { date: "27.12.19:", desc: "Update to Alpine 3.11." }
- { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }
- { date: "18.08.19:", desc: "Add AMD drivers." }
- { date: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
- { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." }
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
- { date: "01.03.19:", desc: "Bump xmltv to 0.6.1." }
- { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." }
- { date: "17.02.19:", desc: "Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend." }
- { date: "14.02.19:", desc: "Add picons path to config." }
- { date: "15.01.19:", desc: "Add pipeline logic and multi arch." }
- { date: "12.09.18:", desc: "Rebase to alpine 3.8 and use buildstage type build." }
- { date: "21.04.18:", desc: "Add JSON::XS Perl package for grab_tv_huro." }
- { date: "24.03.18:", desc: "Add dvbcsa package." }
- { date: "04.03.18:", desc: "Use sourceforge master rather than mirror for xmltv." }
- { date: "22.02.18:", desc: "Add lost libva-intel-driver." }
- { date: "21.02.18:", desc: "Fix wrong version of iconv used." }
- { date: "18.02.18:", desc: "Add vaapi support, some cleanup and dropping of deprecated options." }
- { date: "04.01.18:", desc: "Deprecate cpu_core routine lack of scaling." }
- { date: "11.12.17:", desc: "Rebase to alpine 3.7, linting fixes." }
- { date: "02.09.17:", desc: "Add codec dependencies." }
- { date: "13.07.17:", desc: "Increase uniformity across all archs." }
- { date: "08.07.17:", desc: "Update README with full path for comskip." }
- { date: "02.07.17:", desc: "Move to one branch for all 4.2 releases." }
- { date: "27.05.17:", desc: "Rebase to alpine 3.6." }
- { date: "01.05.17:", desc: "Update to tvheadend 4.2.1 stable." }
- { date: "18.04.17:", desc: "Use repo version of gnu-libiconv rather than compiling." }
- { date: "09.04.17:", desc: "Chain cpanm installs in one block and use --installdeps." }
- { date: "09.02.17:", desc: "Perl changes, add picons file to gitignore and update XMLTV to 0.5.69." }
- { date: "07.02.17:", desc: "Add variable to add additional runtime paramters." }
- { date: "05.02.17:", desc: "Update to alpine 3.5 and change dvb-apps to only compile needed libs." }
- { date: "14.11.16:", desc: "Add picons from picons.xyz to /picons folder and add info to README." }
- { date: "22.09.16:", desc: "Fix broken tv_grab_wg, libs for xmltv and update README." }
- { date: "18.09.16:", desc: "Update XMLTV to 0.5.68 and update README." }
- { date: "10.09.16:", desc: "Add layer badges to README." }
- { date: "05.09.16:", desc: "Initial Release." }

View File

@@ -3,4 +3,4 @@
IFS=" " read -r -a RUN_ARRAY <<< "$RUN_OPTS" IFS=" " read -r -a RUN_ARRAY <<< "$RUN_OPTS"
exec \ exec \
s6-setuidgid abc /usr/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}" s6-setuidgid abc /usr/local/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"