forked from Ivasoft/docker-tvheadend
Compare commits
10 Commits
b824e237-l
...
1979ea7e-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef7477535d | ||
|
|
8cf0723418 | ||
|
|
9a3cdb5a7f | ||
|
|
7f615b5cdb | ||
|
|
35df511806 | ||
|
|
f1c6b20cf3 | ||
|
|
6280ac31f4 | ||
|
|
da2bcad104 | ||
|
|
65db49bd17 | ||
|
|
04343674ae |
20
.editorconfig
Executable file
20
.editorconfig
Executable file
@@ -0,0 +1,20 @@
|
|||||||
|
# This file is globally distributed to all container image projects from
|
||||||
|
# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
|
||||||
|
|
||||||
|
# top-most EditorConfig file
|
||||||
|
root = true
|
||||||
|
|
||||||
|
# Unix-style newlines with a newline ending every file
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
|
||||||
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
|
[{Dockerfile*,**.yml}]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
||||||
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
|
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
|
||||||
* Read, and fill the Pull Request template
|
* Read, and fill the Pull Request template
|
||||||
* If this is a fix for a typo in code or documentation in the README please file an issue
|
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
|
||||||
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
|
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
|
||||||
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
|
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
|
||||||
|
|
||||||
|
|||||||
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<!--- Before submitting a pull request please check the following -->
|
<!--- Before submitting a pull request please check the following -->
|
||||||
|
|
||||||
<!--- If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR -->
|
<!--- If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR -->
|
||||||
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
|
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
|
||||||
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
|
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
|
||||||
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
|
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
|
||||||
|
|||||||
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@v1
|
- uses: actions/stale@v3
|
||||||
with:
|
with:
|
||||||
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
||||||
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
||||||
|
|||||||
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@@ -58,7 +58,7 @@ pipeline {
|
|||||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
||||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
||||||
env.PULL_REQUEST = env.CHANGE_ID
|
env.PULL_REQUEST = env.CHANGE_ID
|
||||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
|
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
|
||||||
}
|
}
|
||||||
script{
|
script{
|
||||||
env.LS_RELEASE_NUMBER = sh(
|
env.LS_RELEASE_NUMBER = sh(
|
||||||
@@ -270,7 +270,6 @@ pipeline {
|
|||||||
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 master
|
||||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
|
||||||
for i in ${TEMPLATES_TO_DELETE}; do
|
for i in ${TEMPLATES_TO_DELETE}; do
|
||||||
git rm "${i}"
|
git rm "${i}"
|
||||||
done
|
done
|
||||||
@@ -531,6 +530,15 @@ pipeline {
|
|||||||
apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
|
apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
|
||||||
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
||||||
chmod 777 /tmp/package_versions.txt'
|
chmod 777 /tmp/package_versions.txt'
|
||||||
|
elif [ "${DIST_IMAGE}" == "fedora" ]; then
|
||||||
|
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
|
||||||
|
rpm -qa > /tmp/package_versions.txt && \
|
||||||
|
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
||||||
|
chmod 777 /tmp/package_versions.txt'
|
||||||
|
elif [ "${DIST_IMAGE}" == "arch" ]; then
|
||||||
|
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
|
||||||
|
pacman -Q > /tmp/package_versions.txt && \
|
||||||
|
chmod 777 /tmp/package_versions.txt'
|
||||||
fi
|
fi
|
||||||
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
|
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
|
||||||
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"
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ Find us at:
|
|||||||
[](https://github.com/linuxserver/docker-tvheadend/releases)
|
[](https://github.com/linuxserver/docker-tvheadend/releases)
|
||||||
[](https://github.com/linuxserver/docker-tvheadend/packages)
|
[](https://github.com/linuxserver/docker-tvheadend/packages)
|
||||||
[](https://gitlab.com/linuxserver.io/docker-tvheadend/container_registry)
|
[](https://gitlab.com/linuxserver.io/docker-tvheadend/container_registry)
|
||||||
[](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
|
|
||||||
[](https://hub.docker.com/r/linuxserver/tvheadend)
|
[](https://hub.docker.com/r/linuxserver/tvheadend)
|
||||||
[](https://hub.docker.com/r/linuxserver/tvheadend)
|
[](https://hub.docker.com/r/linuxserver/tvheadend)
|
||||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
|
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
|
||||||
@@ -123,7 +122,7 @@ For advanced setup of tvheadend, go to [Tvheadend][appurl]
|
|||||||
|
|
||||||
**Picons**
|
**Picons**
|
||||||
|
|
||||||
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.
|
We have added all the picons from [picons](https://github.com/picons/picons) 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
|
||||||
@@ -134,9 +133,7 @@ In some cases it might be necessary to start tvheadend with additional parameter
|
|||||||
|
|
||||||
Here are some example snippets to help you get started creating a container.
|
Here are some example snippets to help you get started creating a container.
|
||||||
|
|
||||||
### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
|
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
|
||||||
|
|
||||||
Compatible with docker-compose v2 schemas.
|
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
---
|
---
|
||||||
@@ -162,7 +159,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
```
|
```
|
||||||
|
|
||||||
### docker cli
|
### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run -d \
|
docker run -d \
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ bzip2-1.0.8-r1
|
|||||||
ca-certificates-20191127-r4
|
ca-certificates-20191127-r4
|
||||||
ca-certificates-bundle-20191127-r4
|
ca-certificates-bundle-20191127-r4
|
||||||
coreutils-8.32-r0
|
coreutils-8.32-r0
|
||||||
curl-7.76.1-r0
|
curl-7.77.0-r0
|
||||||
expat-2.2.9-r1
|
expat-2.2.9-r1
|
||||||
ffmpeg-4.3.1-r0
|
ffmpeg-4.3.1-r0
|
||||||
ffmpeg-libs-4.3.1-r0
|
ffmpeg-libs-4.3.1-r0
|
||||||
@@ -32,14 +32,14 @@ libbsd-0.10.0-r0
|
|||||||
libbz2-1.0.8-r1
|
libbz2-1.0.8-r1
|
||||||
libc-utils-0.7.2-r3
|
libc-utils-0.7.2-r3
|
||||||
libcrypto1.1-1.1.1k-r0
|
libcrypto1.1-1.1.1k-r0
|
||||||
libcurl-7.76.1-r0
|
libcurl-7.77.0-r0
|
||||||
libdav1d-0.7.0-r0
|
libdav1d-0.7.0-r0
|
||||||
libdrm-2.4.102-r0
|
libdrm-2.4.102-r0
|
||||||
libdvbcsa-1.1.0-r1
|
libdvbcsa-1.1.0-r1
|
||||||
libelf-0.179-r0
|
libelf-0.179-r0
|
||||||
libffi-3.3-r2
|
libffi-3.3-r2
|
||||||
libgcc-9.3.0-r2
|
libgcc-9.3.0-r2
|
||||||
libgcrypt-1.8.5-r0
|
libgcrypt-1.8.8-r0
|
||||||
libgpg-error-1.37-r0
|
libgpg-error-1.37-r0
|
||||||
libhdhomerun-libs-20200225-r0
|
libhdhomerun-libs-20200225-r0
|
||||||
libidn-1.35-r0
|
libidn-1.35-r0
|
||||||
@@ -64,13 +64,13 @@ libva-intel-driver-2.4.0-r1
|
|||||||
libvdpau-1.4-r0
|
libvdpau-1.4-r0
|
||||||
libvorbis-1.3.6-r2
|
libvorbis-1.3.6-r2
|
||||||
libvpx-1.8.2-r0
|
libvpx-1.8.2-r0
|
||||||
libx11-1.6.12-r0
|
libx11-1.6.12-r1
|
||||||
libxau-1.0.9-r0
|
libxau-1.0.9-r0
|
||||||
libxcb-1.14-r1
|
libxcb-1.14-r1
|
||||||
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.10-r5
|
libxml2-2.9.10-r6
|
||||||
libxshmfence-1.3-r1
|
libxshmfence-1.3-r1
|
||||||
libxslt-1.1.34-r0
|
libxslt-1.1.34-r0
|
||||||
linux-headers-5.4.5-r1
|
linux-headers-5.4.5-r1
|
||||||
@@ -231,12 +231,12 @@ py3-setuptools-47.0.0-r0
|
|||||||
py3-six-1.15.0-r0
|
py3-six-1.15.0-r0
|
||||||
py3-urllib3-1.25.9-r0
|
py3-urllib3-1.25.9-r0
|
||||||
python2-2.7.18-r0
|
python2-2.7.18-r0
|
||||||
python3-3.8.8-r0
|
python3-3.8.10-r0
|
||||||
readline-8.0.4-r0
|
readline-8.0.4-r0
|
||||||
scanelf-1.2.6-r0
|
scanelf-1.2.6-r0
|
||||||
sdl2-2.0.12-r1
|
sdl2-2.0.12-r1
|
||||||
shadow-4.8.1-r0
|
shadow-4.8.1-r0
|
||||||
sqlite-libs-3.32.1-r0
|
sqlite-libs-3.32.1-r1
|
||||||
ssl_client-1.31.1-r20
|
ssl_client-1.31.1-r20
|
||||||
tar-1.32-r2
|
tar-1.32-r2
|
||||||
tzdata-2021a-r0
|
tzdata-2021a-r0
|
||||||
@@ -252,4 +252,4 @@ xvidcore-1.3.7-r1
|
|||||||
xz-5.2.5-r0
|
xz-5.2.5-r0
|
||||||
xz-libs-5.2.5-r0
|
xz-libs-5.2.5-r0
|
||||||
zlib-1.2.11-r3
|
zlib-1.2.11-r3
|
||||||
zstd-libs-1.4.5-r0
|
zstd-libs-1.4.9-r0
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
**Picons**
|
**Picons**
|
||||||
|
|
||||||
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.
|
We have added all the picons from [picons](https://github.com/picons/picons) 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
|
||||||
|
|||||||
Reference in New Issue
Block a user