Compare commits

..

8 Commits

Author SHA1 Message Date
LinuxServer-CI
a2f49bb75b Bot Updating Package Versions 2019-03-01 22:19:05 +00:00
LinuxServer-CI
3659c4708a Bot Updating Templated Files 2019-03-01 16:35:30 -05:00
aptalca
8387285750 Merge pull request #117 from danofun/master
add perl-lwp-useragent-determined which is needed for tv_grab_zz_sdjson_sqlite
2019-03-01 16:34:31 -05:00
LinuxServer-CI
90d21b6f06 Bot Updating Templated Files 2019-03-01 16:16:43 -05:00
danofun
2631706f5b add changelog entry as requested. 2019-02-28 09:34:40 -05:00
danofun
f6e2be9d51 add perl-lwp-useragent 2019-02-27 21:21:15 -05:00
LinuxServer-CI
e6bb2a1641 Bot Updating Package Versions 2019-02-27 19:26:21 -05:00
LinuxServer-CI
a702166af3 Bot Updating Templated Files 2019-02-27 21:16:49 +00:00
7 changed files with 70 additions and 26 deletions

View File

@@ -78,6 +78,7 @@ RUN \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
perl-list-moreutils \ perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \ perl-module-build \
perl-module-pluggable \ perl-module-pluggable \
perl-net-ssleay \ perl-net-ssleay \
@@ -285,6 +286,7 @@ RUN \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
perl-list-moreutils \ perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \ perl-module-build \
perl-module-pluggable \ perl-module-pluggable \
perl-net-ssleay \ perl-net-ssleay \

View File

@@ -77,6 +77,7 @@ RUN \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
perl-list-moreutils \ perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \ perl-module-build \
perl-module-pluggable \ perl-module-pluggable \
perl-net-ssleay \ perl-net-ssleay \
@@ -284,6 +285,7 @@ RUN \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
perl-list-moreutils \ perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \ perl-module-build \
perl-module-pluggable \ perl-module-pluggable \
perl-net-ssleay \ perl-net-ssleay \

View File

@@ -77,6 +77,7 @@ RUN \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
perl-list-moreutils \ perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \ perl-module-build \
perl-module-pluggable \ perl-module-pluggable \
perl-net-ssleay \ perl-net-ssleay \
@@ -284,6 +285,7 @@ RUN \
perl-lingua-en-numbers-ordinate \ perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \ perl-lingua-preferred \
perl-list-moreutils \ perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \ perl-module-build \
perl-module-pluggable \ perl-module-pluggable \
perl-net-ssleay \ perl-net-ssleay \

33
Jenkinsfile vendored
View File

@@ -41,7 +41,7 @@ pipeline {
script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''', script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''',
returnStdout: true).trim() returnStdout: true).trim()
env.LS_RELEASE_NOTES = sh( env.LS_RELEASE_NOTES = sh(
script: '''git log -1 --pretty=%B | 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' ''',
returnStdout: true).trim() returnStdout: true).trim()
env.GITHUB_DATE = sh( env.GITHUB_DATE = sh(
script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
@@ -292,6 +292,9 @@ pipeline {
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
sh '''docker rmi \
${IMAGE}:arm32v6-${META_TAG} \
lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} '''
} }
} }
} }
@@ -318,6 +321,9 @@ pipeline {
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
sh '''docker rmi \
${IMAGE}:arm64v8-${META_TAG} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
} }
} }
} }
@@ -479,6 +485,10 @@ pipeline {
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
sh "docker push ${IMAGE}:latest" sh "docker push ${IMAGE}:latest"
sh "docker push ${IMAGE}:${META_TAG}" sh "docker push ${IMAGE}:${META_TAG}"
sh '''docker rmi \
${IMAGE}:${META_TAG} \
${IMAGE}:latest '''
} }
} }
} }
@@ -526,6 +536,15 @@ pipeline {
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:latest" sh "docker manifest push --purge ${IMAGE}:latest"
sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
sh '''docker rmi \
${IMAGE}:amd64-${META_TAG} \
${IMAGE}:amd64-latest \
${IMAGE}:arm32v6-${META_TAG} \
${IMAGE}:arm32v6-latest \
${IMAGE}:arm64v8-${META_TAG} \
${IMAGE}:arm64v8-latest \
lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
} }
} }
} }
@@ -586,6 +605,18 @@ pipeline {
} }
} }
} }
// If this is a Pull request send the CI link as a comment on it
stage('Pull Request Comment') {
when {
not {environment name: 'CHANGE_ID', value: ''}
environment name: 'CI', value: 'true'
environment name: 'EXIT_STATUS', value: ''
}
steps {
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' '''
}
}
} }
/* ###################### /* ######################
Send status to Discord Send status to Discord

View File

@@ -14,12 +14,6 @@ Find us at:
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
# PSA: Changes are happening
From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag.
TLDR: Multi-arch support is changing from multiple repos to one repo per container image.
# [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend) # [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend)
[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
[![](https://images.microbadger.com/badges/version/linuxserver/tvheadend.svg)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/version/linuxserver/tvheadend.svg)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
@@ -38,7 +32,7 @@ Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV D
## Supported Architectures ## Supported Architectures
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
Simply pulling `linuxserver/tvheadend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. Simply pulling `linuxserver/tvheadend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
@@ -70,8 +64,8 @@ Here are some example snippets to help you get started creating a container.
``` ```
docker create \ docker create \
--name=tvheadend \ --name=tvheadend \
-e PUID=1001 \ -e PUID=1000 \
-e PGID=1001 \ -e PGID=1000 \
-e TZ=Europe/London \ -e TZ=Europe/London \
-e RUN_OPTS=<run options here> `#optional` \ -e RUN_OPTS=<run options here> `#optional` \
-p 9981:9981 \ -p 9981:9981 \
@@ -101,8 +95,8 @@ services:
image: linuxserver/tvheadend image: linuxserver/tvheadend
container_name: tvheadend container_name: tvheadend
environment: environment:
- PUID=1001 - PUID=1000
- PGID=1001 - PGID=1000
- TZ=Europe/London - TZ=Europe/London
- RUN_OPTS=<run options here> #optional - RUN_OPTS=<run options here> #optional
volumes: volumes:
@@ -114,7 +108,6 @@ services:
devices: devices:
- /dev/dri:/dev/dri #optional - /dev/dri:/dev/dri #optional
- /dev/drb:/dev/dvb #optional - /dev/drb:/dev/dvb #optional
mem_limit: 4096m
restart: unless-stopped restart: unless-stopped
``` ```
@@ -126,8 +119,8 @@ Container images are configured using parameters passed at runtime (such as thos
| :----: | --- | | :----: | --- |
| `-p 9981` | WebUI | | `-p 9981` | WebUI |
| `-p 9982` | HTSP server port. | | `-p 9982` | HTSP server port. |
| `-e PUID=1001` | for UserID - see below for explanation | | `-e PUID=1000` | for UserID - see below for explanation |
| `-e PGID=1001` | for GroupID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation |
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. | | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
| `-e RUN_OPTS=<run options here>` | Optionally specify additional arguments to be passed. See Additional runtime parameters. | | `-e RUN_OPTS=<run options here>` | Optionally specify additional arguments to be passed. See Additional runtime parameters. |
| `-v /config` | Where TVHeadend show store it's config files. | | `-v /config` | Where TVHeadend show store it's config files. |
@@ -141,11 +134,11 @@ When using volumes (`-v` flags) permissions issues can arise between the host OS
Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below: In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
``` ```
$ id username $ id username
uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
``` ```
@@ -235,13 +228,25 @@ Below are the instructions for updating containers:
* Start the new container: `docker start tvheadend` * Start the new container: `docker start tvheadend`
* You can also remove the old dangling images: `docker image prune` * You can also remove the old dangling images: `docker image prune`
### Via Taisun auto-updater (especially useful if you don't remember the original parameters)
* Pull the latest image at its tag and replace it with the same env variables in one shot:
```
docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock taisun/updater \
--oneshot tvheadend
```
* You can also remove the old dangling images: `docker image prune`
### Via Docker Compose ### Via Docker Compose
* Update the image: `docker-compose pull linuxserver/tvheadend` * Update all images: `docker-compose pull`
* Let compose update containers as necessary: `docker-compose up -d` * or update a single image: `docker-compose pull tvheadend`
* Let compose update all containers as necessary: `docker-compose up -d`
* or update a single container: `docker-compose up -d tvheadend`
* You can also remove the old dangling images: `docker image prune` * You can also remove the old dangling images: `docker image prune`
## Versions ## Versions
* **28.02.19:** - add perl-lwp-useragent-determined.
* **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend. * **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend.
* **14.02.19:** - Add picons path to config. * **14.02.19:** - Add picons path to config.
* **15.01.19:** - Add pipeline logic and multi arch. * **15.01.19:** - Add pipeline logic and multi arch.

View File

@@ -2,9 +2,9 @@ musl musl-1.1.19-r10
busybox busybox-1.28.4-r3 busybox busybox-1.28.4-r3
alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-baselayout alpine-baselayout-3.1.0-r0
alpine-keys alpine-keys-2.1-r1 alpine-keys alpine-keys-2.1-r1
libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0
libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 libressl2.7-libssl libressl2.7-libssl-2.7.5-r0
libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 libressl2.7-libtls libressl2.7-libtls-2.7.5-r0
ssl_client ssl_client-1.28.4-r3 ssl_client ssl_client-1.28.4-r3
zlib zlib-1.2.11-r1 zlib zlib-1.2.11-r1
apk-tools apk-tools-2.10.1-r0 apk-tools apk-tools-2.10.1-r0
@@ -75,17 +75,17 @@ xvidcore xvidcore-1.3.4-r1
ffmpeg-libs ffmpeg-libs-3.4.4-r1 ffmpeg-libs ffmpeg-libs-3.4.4-r1
ffmpeg ffmpeg-3.4.4-r1 ffmpeg ffmpeg-3.4.4-r1
gzip gzip-1.9-r0 gzip gzip-1.9-r0
libcrypto1.0 libcrypto1.0-1.0.2q-r0 libcrypto1.0 libcrypto1.0-1.0.2r-r0
libdvbcsa libdvbcsa-1.1.0-r1 libdvbcsa libdvbcsa-1.1.0-r1
libhdhomerun-libs libhdhomerun-libs-20161117-r1 libhdhomerun-libs libhdhomerun-libs-20161117-r1
libssl1.0 libssl1.0-1.0.2q-r0 libssl1.0 libssl1.0-1.0.2r-r0
libva-intel-driver libva-intel-driver-2.1.0-r0 libva-intel-driver libva-intel-driver-2.1.0-r0
libxml2 libxml2-2.9.8-r1 libxml2 libxml2-2.9.8-r1
libgpg-error libgpg-error-1.30-r0 libgpg-error libgpg-error-1.30-r0
libgcrypt libgcrypt-1.8.3-r0 libgcrypt libgcrypt-1.8.3-r0
libxslt libxslt-1.1.32-r0 libxslt libxslt-1.1.32-r0
linux-headers linux-headers-4.4.6-r2 linux-headers linux-headers-4.4.6-r2
openssl openssl-1.0.2q-r0 openssl openssl-1.0.2r-r0
pcre2 pcre2-10.31-r0 pcre2 pcre2-10.31-r0
perl perl-5.26.3-r0 perl perl-5.26.3-r0
perl-archive-zip perl-archive-zip-1.60-r0 perl-archive-zip perl-archive-zip-1.60-r0
@@ -187,6 +187,7 @@ perl-http-negotiate perl-http-negotiate-6.01-r1
perl-libwww perl-libwww-6.34-r0 perl-libwww perl-libwww-6.34-r0
perl-lingua-en-numbers-ordinate perl-lingua-en-numbers-ordinate-1.04-r1 perl-lingua-en-numbers-ordinate perl-lingua-en-numbers-ordinate-1.04-r1
perl-lingua-preferred perl-lingua-preferred-0.2.4-r1 perl-lingua-preferred perl-lingua-preferred-0.2.4-r1
perl-lwp-useragent-determined perl-lwp-useragent-determined-1.07-r0
perl-module-build perl-module-build-0.4224-r0 perl-module-build perl-module-build-0.4224-r0
perl-parse-recdescent perl-parse-recdescent-1.967015-r1 perl-parse-recdescent perl-parse-recdescent-1.967015-r1
perl-path-class perl-path-class-0.37-r0 perl-path-class perl-path-class-0.37-r0
@@ -209,7 +210,7 @@ perl-xml-writer perl-xml-writer-0.625-r2
gdbm gdbm-1.13-r1 gdbm gdbm-1.13-r1
sqlite-libs sqlite-libs-3.25.3-r0 sqlite-libs sqlite-libs-3.25.3-r0
python2 python2-2.7.15-r1 python2 python2-2.7.15-r1
tar tar-1.31-r0 tar tar-1.32-r0
uriparser uriparser-0.8.5-r0 uriparser uriparser-0.8.5-r0
wget wget-1.20.1-r0 wget wget-1.20.1-r0
x264 x264-20180304-r1 x264 x264-20180304-r1

View File

@@ -125,6 +125,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { 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: "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: "14.02.19:", desc: "Add picons path to config." }
- { date: "15.01.19:", desc: "Add pipeline logic and multi arch." } - { date: "15.01.19:", desc: "Add pipeline logic and multi arch." }