Compare commits

...

25 Commits

Author SHA1 Message Date
LinuxServer-CI
e46a100668 Bot Updating Package Versions 2020-04-16 22:40:03 -04:00
LinuxServer-CI
a264297038 Bot Updating Templated Files 2020-04-10 02:03:23 +00:00
LinuxServer-CI
1d382f1e2d Bot Updating Package Versions 2020-04-02 22:38:19 -04:00
LinuxServer-CI
92de6b3807 Bot Updating Package Versions 2020-03-27 05:48:39 +00:00
LinuxServer-CI
de6a3f09aa Bot Updating Package Versions 2020-03-06 05:41:35 +00:00
LinuxServer-CI
27de84621d Bot Updating Package Versions 2020-03-01 20:58:08 +00:00
LinuxServer-CI
af32e275fc Bot Updating Templated Files 2020-03-01 20:02:16 +00:00
j0nnymoe
b53c4e8a95 Merge pull request #160 from hotio/patch-1
Fix picons website url
2020-03-01 20:01:21 +00:00
hotio
da780f88bc Fix picons website url
Use the current new domain of my project picons.eu instead of the outdated picons.xyz
2020-03-01 18:48:52 +01:00
LinuxServer-CI
c293456f31 Bot Updating Package Versions 2020-02-28 04:16:08 +00:00
LinuxServer-CI
0d8c5aa390 Bot Updating Package Versions 2020-02-14 03:52:59 +00:00
LinuxServer-CI
aa73a745f3 Bot Updating Package Versions 2020-02-10 17:06:58 -05:00
tobbenb
9d7a35ba91 Remove docker-tvheadend.md file 2020-02-10 13:32:00 -08:00
tobbenb
7253c86d23 Forgot requests package for arm 2020-02-10 13:32:00 -08:00
tobbenb
317114ce56 Add requests and perl-json-xs package 2020-02-10 13:32:00 -08:00
LinuxServer-CI
922de73700 Bot Updating Package Versions 2020-02-07 03:49:33 +00:00
LinuxServer-CI
0dff29da35 Bot Updating Package Versions 2020-01-17 03:30:14 +00:00
LinuxServer-CI
6d325b1f7e Bot Updating Package Versions 2020-01-09 22:36:43 -05:00
LinuxServer-CI
f2423c1628 Bot Updating Package Versions 2019-12-28 02:34:07 +01:00
LinuxServer-CI
6a902e358e Bot Updating Templated Files 2019-12-28 01:06:03 +00:00
tobbenb
05e3e94c17 Forgot alot of shit 2019-12-27 17:05:03 -08:00
tobbenb
f69f0308e8 Update to Alpine 3.11 2019-12-27 17:05:03 -08:00
LinuxServer-CI
0aa53af054 Bot Updating Package Versions 2019-12-27 03:37:00 +00:00
LinuxServer-CI
8290519f1e Bot Updating Package Versions 2019-12-19 22:49:09 -05:00
LinuxServer-CI
99f9917b5f Bot Updating Templated Files 2019-11-28 21:17:02 +00:00
9 changed files with 218 additions and 168 deletions

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine:3.10 as buildstage FROM lsiobase/alpine:3.11 as buildstage
############## build stage ############## ############## build stage ##############
# package versions # package versions
@@ -29,6 +29,7 @@ RUN \
gcc \ gcc \
gettext-dev \ gettext-dev \
git \ git \
gnu-libiconv-dev \
gzip \ gzip \
jq \ jq \
libcurl \ libcurl \
@@ -74,6 +75,7 @@ RUN \
perl-io-socket-ssl \ perl-io-socket-ssl \
perl-io-stringy \ perl-io-stringy \
perl-json \ perl-json \
perl-json-xs \
perl-libwww \ perl-libwww \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
@@ -108,10 +110,7 @@ RUN \
wget \ wget \
x264-dev \ x264-dev \
x265-dev \ x265-dev \
zlib-dev && \ zlib-dev
apk add --no-cache \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
gnu-libiconv-dev
RUN \ RUN \
echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \ echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -128,6 +127,8 @@ RUN \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \ cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \ 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 ****" && \ 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_latex && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \ sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -220,7 +221,7 @@ RUN \
make DESTDIR=/tmp/comskip-build install make DESTDIR=/tmp/comskip-build install
############## runtime stage ############## ############## runtime stage ##############
FROM lsiobase/alpine:3.10 FROM lsiobase/alpine:3.11
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -239,6 +240,7 @@ RUN \
curl \ curl \
ffmpeg \ ffmpeg \
ffmpeg-libs \ ffmpeg-libs \
gnu-libiconv \
gzip \ gzip \
libcrypto1.1 \ libcrypto1.1 \
libcurl \ libcurl \
@@ -283,6 +285,7 @@ RUN \
perl-io-socket-ssl \ perl-io-socket-ssl \
perl-io-stringy \ perl-io-stringy \
perl-json \ perl-json \
perl-json-xs \
perl-libwww \ perl-libwww \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
@@ -308,6 +311,7 @@ RUN \
perl-xml-treepp \ perl-xml-treepp \
perl-xml-twig \ perl-xml-twig \
perl-xml-writer \ perl-xml-writer \
py3-requests \
python \ python \
tar \ tar \
uriparser \ uriparser \
@@ -315,9 +319,6 @@ RUN \
x264 \ x264 \
x265 \ x265 \
zlib && \ zlib && \
apk add --no-cache \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
gnu-libiconv && \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
@@ -335,4 +336,4 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9981 9982 EXPOSE 9981 9982
VOLUME /config /recordings VOLUME /config

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine:arm64v8-3.10 as buildstage FROM lsiobase/alpine:arm64v8-3.11 as buildstage
############## build stage ############## ############## build stage ##############
# package versions # package versions
@@ -29,6 +29,7 @@ RUN \
gcc \ gcc \
gettext-dev \ gettext-dev \
git \ git \
gnu-libiconv-dev \
gzip \ gzip \
jq \ jq \
libcurl \ libcurl \
@@ -73,6 +74,7 @@ RUN \
perl-io-socket-ssl \ perl-io-socket-ssl \
perl-io-stringy \ perl-io-stringy \
perl-json \ perl-json \
perl-json-xs \
perl-libwww \ perl-libwww \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
@@ -107,10 +109,7 @@ RUN \
wget \ wget \
x264-dev \ x264-dev \
x265-dev \ x265-dev \
zlib-dev && \ zlib-dev
apk add --no-cache \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
gnu-libiconv-dev
RUN \ RUN \
echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \ echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -127,6 +126,8 @@ RUN \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \ cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \ 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 ****" && \ 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_latex && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \ sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -218,7 +219,7 @@ RUN \
make DESTDIR=/tmp/comskip-build install make DESTDIR=/tmp/comskip-build install
############## runtime stage ############## ############## runtime stage ##############
FROM lsiobase/alpine:arm64v8-3.10 FROM lsiobase/alpine:arm64v8-3.11
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -237,6 +238,7 @@ RUN \
curl \ curl \
ffmpeg \ ffmpeg \
ffmpeg-libs \ ffmpeg-libs \
gnu-libiconv \
gzip \ gzip \
libcrypto1.1 \ libcrypto1.1 \
libcurl \ libcurl \
@@ -278,6 +280,7 @@ RUN \
perl-io-socket-ssl \ perl-io-socket-ssl \
perl-io-stringy \ perl-io-stringy \
perl-json \ perl-json \
perl-json-xs \
perl-libwww \ perl-libwww \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
@@ -303,6 +306,7 @@ RUN \
perl-xml-treepp \ perl-xml-treepp \
perl-xml-twig \ perl-xml-twig \
perl-xml-writer \ perl-xml-writer \
py3-requests \
python \ python \
tar \ tar \
uriparser \ uriparser \
@@ -310,9 +314,6 @@ RUN \
x264 \ x264 \
x265 \ x265 \
zlib && \ zlib && \
apk add --no-cache \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
gnu-libiconv && \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
@@ -330,4 +331,4 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9981 9982 EXPOSE 9981 9982
VOLUME /config /recordings VOLUME /config

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine:arm32v7-3.10 as buildstage FROM lsiobase/alpine:arm32v7-3.11 as buildstage
############## build stage ############## ############## build stage ##############
# package versions # package versions
@@ -29,6 +29,7 @@ RUN \
gcc \ gcc \
gettext-dev \ gettext-dev \
git \ git \
gnu-libiconv-dev \
gzip \ gzip \
jq \ jq \
libcurl \ libcurl \
@@ -73,6 +74,7 @@ RUN \
perl-io-socket-ssl \ perl-io-socket-ssl \
perl-io-stringy \ perl-io-stringy \
perl-json \ perl-json \
perl-json-xs \
perl-libwww \ perl-libwww \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
@@ -107,10 +109,7 @@ RUN \
wget \ wget \
x264-dev \ x264-dev \
x265-dev \ x265-dev \
zlib-dev && \ zlib-dev
apk add --no-cache \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
gnu-libiconv-dev
RUN \ RUN \
echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \ echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -127,6 +126,8 @@ RUN \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \ cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \ 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 ****" && \ 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_latex && \
sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \ sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -218,7 +219,7 @@ RUN \
make DESTDIR=/tmp/comskip-build install make DESTDIR=/tmp/comskip-build install
############## runtime stage ############## ############## runtime stage ##############
FROM lsiobase/alpine:arm32v7-3.10 FROM lsiobase/alpine:arm32v7-3.11
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -237,6 +238,7 @@ RUN \
curl \ curl \
ffmpeg \ ffmpeg \
ffmpeg-libs \ ffmpeg-libs \
gnu-libiconv \
gzip \ gzip \
libcrypto1.1 \ libcrypto1.1 \
libcurl \ libcurl \
@@ -278,6 +280,7 @@ RUN \
perl-io-socket-ssl \ perl-io-socket-ssl \
perl-io-stringy \ perl-io-stringy \
perl-json \ perl-json \
perl-json-xs \
perl-libwww \ perl-libwww \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
@@ -303,6 +306,7 @@ RUN \
perl-xml-treepp \ perl-xml-treepp \
perl-xml-twig \ perl-xml-twig \
perl-xml-writer \ perl-xml-writer \
py3-requests \
python \ python \
tar \ tar \
uriparser \ uriparser \
@@ -310,9 +314,6 @@ RUN \
x264 \ x264 \
x265 \ x265 \
zlib && \ zlib && \
apk add --no-cache \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
gnu-libiconv && \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
@@ -330,4 +331,4 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9981 9982 EXPOSE 9981 9982
VOLUME /config /recordings VOLUME /config

6
Jenkinsfile vendored
View File

@@ -627,7 +627,7 @@ pipeline {
docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:latest
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
done done
for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
@@ -741,12 +741,12 @@ pipeline {
sh 'echo "build aborted"' sh 'echo "build aborted"'
} }
else if (currentBuild.currentResult == "SUCCESS"){ else if (currentBuild.currentResult == "SUCCESS"){
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
"username": "Jenkins"}' ${BUILDS_DISCORD} ''' "username": "Jenkins"}' ${BUILDS_DISCORD} '''
} }
else { else {
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
"username": "Jenkins"}' ${BUILDS_DISCORD} ''' "username": "Jenkins"}' ${BUILDS_DISCORD} '''
} }

View File

@@ -5,10 +5,9 @@
[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
* regular and timely application updates * regular and timely application updates
* easy user mappings (PGID, PUID) * easy user mappings (PGID, PUID)
@@ -22,7 +21,6 @@ Find us at:
* [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
# [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend) # [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend)
@@ -105,7 +103,7 @@ Compatible with docker-compose v2 schemas.
``` ```
--- ---
version: "2" version: "2.1"
services: services:
tvheadend: tvheadend:
image: linuxserver/tvheadend image: linuxserver/tvheadend
@@ -144,6 +142,18 @@ Container images are configured using parameters passed at runtime (such as thos
| `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). | | `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). |
| `--device /dev/dvb` | Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out. | | `--device /dev/dvb` | Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out. |
## Environment variables from files (Docker secrets)
You can set any environment variable from a file by using a special prepend `FILE__`.
As an example:
```
-e FILE__PASSWORD=/run/secrets/mysecretpassword
```
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
## User / Group Identifiers ## User / Group Identifiers
When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
@@ -212,7 +222,7 @@ For advanced setup of tvheadend, go to [Tvheadend][appurl]
**Picons** **Picons**
We have added all the picons from [picons.xyz](https://picons.xyz/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base. We have added all the picons from [picons.eu](https://picons.eu/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
You need to enable minimum advanced view level to see the picons options. You need to enable minimum advanced view level to see the picons options.
## Additional runtime parameters ## Additional runtime parameters
@@ -220,6 +230,11 @@ You need to enable minimum advanced view level to see the picons options.
In some cases it might be necessary to start tvheadend with additional parameters, for example to enable debugging or specify webroot for reverse proxy. Be sure to have the right parameters set, as adding the wrong once might lead to the container not starting correctly. In some cases it might be necessary to start tvheadend with additional parameters, for example to enable debugging or specify webroot for reverse proxy. Be sure to have the right parameters set, as adding the wrong once might lead to the container not starting correctly.
## Docker Mods
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27tvheadend%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=tvheadend "view available mods for this container.")
We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
## Support Info ## Support Info
@@ -285,6 +300,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **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. * **02.10.19:** - Improve permission fixing on render & dvb devices.
* **18.08.19:** - Add AMD drivers. * **18.08.19:** - Add AMD drivers.
* **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb. * **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb.

View File

@@ -1,113 +1,114 @@
alpine-baselayout-3.1.2-r0 alpine-baselayout-3.2.0-r3
alpine-keys-2.1-r2 alpine-keys-2.1-r2
alsa-lib-1.1.9-r0 alsa-lib-1.2.1.2-r0
apk-tools-2.10.4-r2 apk-tools-2.10.5-r0
bash-5.0.0-r0 bash-5.0.11-r1
bsd-compat-headers-0.7.1-r0 bsd-compat-headers-0.7.2-r0
busybox-1.30.1-r3 busybox-1.31.1-r9
bzip2-1.0.6-r7 bzip2-1.0.8-r1
ca-certificates-20190108-r0 ca-certificates-20191127-r1
ca-certificates-cacert-20190108-r0 ca-certificates-cacert-20191127-r1
coreutils-8.31-r0 coreutils-8.31-r0
curl-7.66.0-r0 curl-7.67.0-r0
elfutils-libelf-0.168-r2 elfutils-libelf-0.168-r2
expat-2.2.8-r0 expat-2.2.9-r1
ffmpeg-4.1.4-r0 ffmpeg-4.2.1-r3
ffmpeg-libs-4.1.4-r0 ffmpeg-libs-4.2.1-r3
fontconfig-2.13.1-r0 fontconfig-2.13.1-r2
freetype-2.10.0-r0 freetype-2.10.1-r0
fribidi-1.0.5-r2 fribidi-1.0.8-r0
gdbm-1.13-r1 gdbm-1.13-r1
gmp-6.1.2-r1 gmp-6.1.2-r1
gnu-libiconv-1.15-r2 gnu-libiconv-1.15-r2
gnutls-3.6.8-r0 gnutls-3.6.10-r1
gzip-1.10-r0 gzip-1.10-r0
lame-3.100-r0 lame-3.100-r0
libacl-2.2.52-r6 libacl-2.2.53-r0
libass-0.14.0-r0 libass-0.14.0-r0
libattr-2.4.48-r0 libattr-2.4.48-r0
libbsd-0.9.1-r0 libbsd-0.10.0-r0
libbz2-1.0.6-r7 libbz2-1.0.8-r1
libc-utils-0.7.1-r0 libc-utils-0.7.2-r0
libcrypto1.1-1.1.1d-r0 libcrypto1.1-1.1.1d-r3
libcurl-7.66.0-r0 libcurl-7.67.0-r0
libdrm-2.4.98-r0 libdrm-2.4.100-r0
libdvbcsa-1.1.0-r1 libdvbcsa-1.1.0-r1
libffi-3.2.1-r6 libffi-3.2.1-r6
libgcc-8.3.0-r0 libgcc-9.2.0-r4
libgcrypt-1.8.5-r0 libgcrypt-1.8.5-r0
libgpg-error-1.36-r2 libgpg-error-1.36-r2
libhdhomerun-libs-20161117-r1 libhdhomerun-libs-20190621-r0
libidn-1.35-r0 libidn-1.35-r0
libjpeg-turbo-2.0.3-r0 libjpeg-turbo-2.0.4-r0
libogg-1.3.3-r2 libogg-1.3.4-r0
libpciaccess-0.14-r0 libpciaccess-0.16-r0
libpng-1.6.37-r1 libpng-1.6.37-r1
libssl1.1-1.1.1d-r0 libssl1.1-1.1.1d-r3
libstdc++-8.3.0-r0 libstdc++-9.2.0-r4
libtasn1-4.14-r0 libtasn1-4.15.0-r0
libtheora-1.1.1-r14 libtheora-1.1.1-r14
libtls-standalone-2.9.1-r0 libtls-standalone-2.9.1-r0
libunistring-0.9.10-r0 libunistring-0.9.10-r0
liburiparser-0.9.3-r0 liburiparser-0.9.3-r0
libuuid-2.33.2-r0 libuuid-2.34-r1
libva-2.4.1-r0 libva-2.6.0-r0
libva-intel-driver-2.3.0-r0 libva-intel-driver-2.4.0-r0
libvdpau-1.2-r0 libvdpau-1.3-r0
libvorbis-1.3.6-r2 libvorbis-1.3.6-r2
libvpx-1.8.0-r0 libvpx-1.8.1-r0
libx11-1.6.8-r1 libx11-1.6.9-r0
libxau-1.0.9-r0 libxau-1.0.9-r0
libxcb-1.13.1-r0 libxcb-1.13.1-r0
libxdmcp-1.1.3-r0 libxdmcp-1.1.3-r0
libxext-1.3.4-r0 libxext-1.3.4-r0
libxfixes-5.0.3-r2 libxfixes-5.0.3-r2
libxml2-2.9.9-r2 libxml2-2.9.10-r2
libxshmfence-1.3-r0 libxshmfence-1.3-r0
libxslt-1.1.33-r2 libxslt-1.1.34-r0
linux-headers-4.19.36-r0 linux-headers-4.19.36-r0
linux-pam-1.3.0-r1 linux-pam-1.3.1-r1
llvm8-libs-8.0.0-r1 llvm9-libs-9.0.0-r1
mesa-19.0.6-r0 mesa-19.2.7-r0
mesa-dri-ati-19.0.6-r0 mesa-dri-ati-19.2.7-r0
mesa-glapi-19.0.6-r0 mesa-glapi-19.2.7-r0
musl-1.1.22-r3 musl-1.1.24-r2
musl-utils-1.1.22-r3 musl-utils-1.1.24-r2
ncurses-libs-6.1_p20190518-r0 ncurses-libs-6.1_p20200118-r3
ncurses-terminfo-6.1_p20190518-r0 ncurses-terminfo-base-6.1_p20200118-r3
ncurses-terminfo-base-6.1_p20190518-r0 nettle-3.5.1-r0
nettle-3.4.1-r1 nghttp2-libs-1.40.0-r0
nghttp2-libs-1.39.2-r0 openssl-1.1.1d-r3
openssl-1.1.1d-r0
opus-1.3.1-r0 opus-1.3.1-r0
p11-kit-0.23.16.1-r0 p11-kit-0.23.18.1-r0
pcre2-10.33-r0 pcre2-10.34-r1
perl-5.28.2-r1 perl-5.30.1-r0
perl-archive-zip-1.64-r0 perl-archive-zip-1.67-r0
perl-b-hooks-endofscope-0.24-r0 perl-b-hooks-endofscope-0.24-r0
perl-boolean-0.46-r0 perl-boolean-0.46-r0
perl-canary-stability-2013-r0
perl-capture-tiny-0.48-r0 perl-capture-tiny-0.48-r0
perl-cgi-4.44-r0 perl-cgi-4.44-r0
perl-class-data-inheritable-0.08-r0 perl-class-data-inheritable-0.08-r0
perl-class-inspector-1.34-r0 perl-class-inspector-1.36-r0
perl-class-methodmaker-2.24-r3 perl-class-methodmaker-2.24-r4
perl-class-singleton-1.5-r0 perl-class-singleton-1.5-r0
perl-compress-raw-bzip2-2.086-r1 perl-common-sense-3.74-r1
perl-compress-raw-zlib-2.086-r1 perl-compress-raw-bzip2-2.093-r0
perl-compress-raw-zlib-2.093-r0
perl-cpan-meta-check-0.014-r0 perl-cpan-meta-check-0.014-r0
perl-data-dumper-2.173-r1 perl-data-dumper-2.173-r3
perl-date-manip-6.77-r0 perl-date-manip-6.79-r0
perl-datetime-1.51-r0 perl-datetime-1.51-r1
perl-datetime-format-strptime-1.76-r0 perl-datetime-format-strptime-1.76-r0
perl-datetime-locale-1.23-r0 perl-datetime-locale-1.25-r0
perl-datetime-timezone-2.19-r0 perl-datetime-timezone-2.38-r0
perl-dbd-sqlite-1.62-r1 perl-dbd-sqlite-1.64-r1
perl-dbi-1.642-r1 perl-dbi-1.642-r2
perl-devel-stacktrace-2.04-r0 perl-devel-stacktrace-2.04-r0
perl-devel-symdump-2.18-r0 perl-devel-symdump-2.18-r0
perl-digest-sha1-2.13-r10 perl-digest-sha1-2.13-r11
perl-dist-checkconflicts-0.11-r0 perl-dist-checkconflicts-0.11-r0
perl-doc-5.28.2-r1 perl-doc-5.30.1-r0
perl-encode-locale-1.05-r1 perl-encode-locale-1.05-r1
perl-eval-closure-0.14-r0 perl-eval-closure-0.14-r0
perl-exception-class-1.44-r0 perl-exception-class-1.44-r0
@@ -115,112 +116,120 @@ perl-exporter-tiny-1.002001-r0
perl-file-listing-6.04-r1 perl-file-listing-6.04-r1
perl-file-sharedir-1.116-r0 perl-file-sharedir-1.116-r0
perl-file-sharedir-install-0.13-r0 perl-file-sharedir-install-0.13-r0
perl-file-slurp-9999.27-r0 perl-file-slurp-9999.29-r0
perl-file-temp-0.2309-r0 perl-file-temp-0.2309-r0
perl-file-which-1.23-r0 perl-file-which-1.23-r0
perl-getopt-long-2.50-r0 perl-getopt-long-2.51-r0
perl-html-parser-3.72-r3 perl-html-parser-3.72-r4
perl-html-tagset-3.20-r1 perl-html-tagset-3.20-r1
perl-html-tree-5.07-r0 perl-html-tree-5.07-r0
perl-http-cookies-6.04-r0 perl-http-cookies-6.08-r0
perl-http-daemon-6.01-r1 perl-http-daemon-6.06-r0
perl-http-date-6.02-r1 perl-http-date-6.05-r0
perl-http-message-6.18-r0 perl-http-message-6.18-r0
perl-http-negotiate-6.01-r1 perl-http-negotiate-6.01-r1
perl-importer-0.025-r0 perl-importer-0.025-r0
perl-io-1.25-r5 perl-io-1.39-r0
perl-io-compress-2.086-r0 perl-io-compress-2.093-r0
perl-io-html-1.001-r1 perl-io-html-1.001-r2
perl-io-socket-ssl-2.060-r0 perl-io-socket-ssl-2.066-r0
perl-io-stringy-2.111-r1 perl-io-stringy-2.112-r0
perl-ipc-run3-0.048-r0 perl-ipc-run3-0.048-r1
perl-json-2.97000-r0 perl-json-4.02-r0
perl-libwww-6.39-r1 perl-json-xs-4.02-r1
perl-libwww-6.43-r0
perl-lingua-en-numbers-ordinate-1.04-r1 perl-lingua-en-numbers-ordinate-1.04-r1
perl-lingua-preferred-0.2.4-r1 perl-lingua-preferred-0.2.4-r1
perl-list-moreutils-0.428-r0 perl-list-moreutils-0.428-r0
perl-list-moreutils-xs-0.428-r1 perl-list-moreutils-xs-0.428-r2
perl-lwp-mediatypes-6.04-r0 perl-lwp-mediatypes-6.04-r0
perl-lwp-useragent-determined-1.07-r0 perl-lwp-useragent-determined-1.07-r0
perl-module-build-0.4229-r0 perl-module-build-0.4229-r0
perl-module-implementation-0.09-r1 perl-module-implementation-0.09-r1
perl-module-metadata-1.000036-r0 perl-module-metadata-1.000037-r0
perl-module-pluggable-5.2-r0 perl-module-pluggable-5.2-r0
perl-module-runtime-0.016-r2 perl-module-runtime-0.016-r2
perl-mro-compat-0.13-r0 perl-mro-compat-0.13-r0
perl-namespace-autoclean-0.28-r0 perl-namespace-autoclean-0.29-r0
perl-namespace-clean-0.27-r0 perl-namespace-clean-0.27-r0
perl-net-http-6.19-r0 perl-net-http-6.19-r0
perl-net-libidn-0.12-r6 perl-net-libidn-0.12-r7
perl-net-ssleay-1.85-r5 perl-net-ssleay-1.88-r0
perl-package-deprecationmanager-0.17-r0 perl-package-deprecationmanager-0.17-r0
perl-package-stash-0.38-r1 perl-package-stash-0.38-r1
perl-package-stash-xs-0.29-r1 perl-package-stash-xs-0.29-r2
perl-params-util-1.07-r6 perl-params-util-1.07-r7
perl-params-validate-1.29-r1 perl-params-validate-1.29-r2
perl-params-validationcompiler-0.27-r0 perl-params-validationcompiler-0.30-r0
perl-parse-recdescent-1.967015-r1 perl-parse-recdescent-1.967015-r1
perl-path-class-0.37-r0 perl-path-class-0.37-r0
perl-pod-coverage-0.23-r0 perl-pod-coverage-0.23-r0
perl-role-tiny-2.000006-r0 perl-role-tiny-2.001004-r0
perl-scalar-list-utils-1.50-r1 perl-scalar-list-utils-1.53-r1
perl-scope-guard-0.21-r0 perl-scope-guard-0.21-r0
perl-specio-0.42-r0 perl-specio-0.45-r0
perl-sub-exporter-progressive-0.001013-r0 perl-sub-exporter-progressive-0.001013-r0
perl-sub-identify-0.14-r2 perl-sub-identify-0.14-r3
perl-sub-info-0.002-r0 perl-sub-info-0.002-r0
perl-sub-install-0.928-r0 perl-sub-install-0.928-r0
perl-sub-name-0.21-r2 perl-sub-name-0.26-r0
perl-sub-quote-2.004000-r0 perl-sub-quote-2.006006-r0
perl-sub-uplevel-0.2800-r0 perl-sub-uplevel-0.2800-r0
perl-term-progressbar-2.22-r0 perl-term-progressbar-2.22-r0
perl-term-readkey-2.38-r1 perl-term-readkey-2.38-r2
perl-term-table-0.012-r0 perl-term-table-0.015-r0
perl-test-exception-0.43-r0 perl-test-exception-0.43-r0
perl-test-fatal-0.014-r1 perl-test-fatal-0.014-r1
perl-test-needs-0.002005-r1 perl-test-needs-0.002006-r0
perl-test-pod-1.52-r0 perl-test-pod-1.52-r0
perl-test-requires-0.10-r0 perl-test-requires-0.10-r0
perl-test-simple-1.302164-r0 perl-test-simple-1.302170-r0
perl-test-taint-1.08-r0 perl-test-taint-1.08-r1
perl-test-warnings-0.026-r0 perl-test-warnings-0.027-r0
perl-test-without-module-0.20-r0 perl-test-without-module-0.20-r0
perl-test2-plugin-nowarnings-0.07-r0 perl-test2-plugin-nowarnings-0.08-r0
perl-test2-suite-0.000122-r0 perl-test2-suite-0.000127-r0
perl-timedate-2.30-r1 perl-timedate-2.30-r1
perl-try-tiny-0.30-r1 perl-try-tiny-0.30-r1
perl-unicode-string-2.09-r7 perl-types-serialiser-1.0-r1
perl-unicode-string-2.10-r1
perl-uri-1.76-r0 perl-uri-1.76-r0
perl-variable-magic-0.62-r1 perl-variable-magic-0.62-r2
perl-www-robotrules-6.02-r1 perl-www-robotrules-6.02-r1
perl-xml-libxml-2.0134-r2 perl-xml-libxml-2.0134-r3
perl-xml-libxslt-1.96-r1 perl-xml-libxslt-1.96-r2
perl-xml-namespacesupport-1.12-r0 perl-xml-namespacesupport-1.12-r0
perl-xml-parser-2.44-r5 perl-xml-parser-2.46-r0
perl-xml-sax-0.99-r2 perl-xml-sax-1.02-r0
perl-xml-sax-base-1.09-r0 perl-xml-sax-base-1.09-r0
perl-xml-treepp-0.43-r1 perl-xml-treepp-0.43-r1
perl-xml-twig-3.52-r1 perl-xml-twig-3.52-r1
perl-xml-writer-0.625-r2 perl-xml-writer-0.625-r2
perl-yaml-syck-1.31-r1 perl-yaml-syck-1.31-r2
python2-2.7.16-r1 py3-certifi-2019.9.11-r2
readline-8.0.0-r0 py3-chardet-3.0.4-r3
scanelf-1.2.3-r0 py3-idna-2.8-r3
py3-requests-2.22.0-r0
py3-urllib3-1.25.7-r1
python2-2.7.16-r3
python3-3.8.2-r0
readline-8.0.1-r0
scanelf-1.2.4-r0
sdl2-2.0.10-r0 sdl2-2.0.10-r0
shadow-4.6-r2 shadow-4.7-r1
sqlite-libs-3.28.0-r1 sqlite-libs-3.30.1-r1
ssl_client-1.30.1-r3 ssl_client-1.31.1-r9
tar-1.32-r0 tar-1.32-r1
tzdata-2019c-r0 tzdata-2019c-r0
uriparser-0.9.3-r0 uriparser-0.9.3-r0
v4l-utils-libs-1.16.6-r0 v4l-utils-libs-1.18.0-r0
wayland-libs-client-1.17.0-r0 wayland-libs-client-1.17.0-r0
wget-1.20.3-r0 wget-1.20.3-r0
x264-20180304-r1 x264-20191119-r0
x264-libs-20180304-r1 x264-libs-20191119-r0
x265-3.0-r0 x265-3.2.1-r0
x265-libs-3.0-r0 x265-libs-3.2.1-r0
xvidcore-1.3.4-r1 xvidcore-1.3.5-r0
xz-5.2.4-r0 xz-5.2.4-r0
xz-libs-5.2.4-r0 xz-libs-5.2.4-r0
zlib-1.2.11-r1 zlib-1.2.11-r3

View File

@@ -11,7 +11,6 @@ requires 'HTML::TableExtract' ;
requires 'HTTP::Cache::Transparent' => ">= 1.3, != 1.4" ; requires 'HTTP::Cache::Transparent' => ">= 1.3, != 1.4" ;
requires 'inc' ; requires 'inc' ;
requires 'JSON::PP' ; requires 'JSON::PP' ;
requires 'JSON::XS' ;
requires 'LWP::Simple' ; requires 'LWP::Simple' ;
requires 'LWP::UserAgent' ; requires 'LWP::UserAgent' ;
requires 'PerlIO::gzip' ; requires 'PerlIO::gzip' ;

View File

@@ -0,0 +1,20 @@
---
t/test_tv_imdb.t | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t
index ad504464..4dc281a1 100755
--- a/t/test_tv_imdb.t
+++ b/t/test_tv_imdb.t
@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) {
my $output="$tmpDir/".File::Basename::basename($input)."-output.xml";
# Make temporary directory and split into it.
- my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
+ my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
if ( $input=~m/movies-only/ ) {
- $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
+ $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
}
#print STDERR "\nRUN:$cmd\n";
my $r = system($cmd);

View File

@@ -117,7 +117,7 @@ app_setup_block: |
**Picons** **Picons**
We have added all the picons from [picons.xyz](https://picons.xyz/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base. We have added all the picons from [picons.eu](https://picons.eu/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
You need to enable minimum advanced view level to see the picons options. You need to enable minimum advanced view level to see the picons options.
## Additional runtime parameters ## Additional runtime parameters
@@ -126,6 +126,8 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { 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: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }
- { date: "18.08.19:", desc: "Add AMD drivers." } - { 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: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }