Compare commits

..

6 Commits

Author SHA1 Message Date
LinuxServer-CI
78d9a02ed1 Bot Updating Templated Files 2019-05-02 22:03:15 -04:00
LinuxServer-CI
58e666bbd5 Bot Updating Package Versions 2019-04-19 04:48:08 +02:00
LinuxServer-CI
fadee48d67 Bot Updating Package Versions 2019-04-12 02:30:47 +00:00
Ryan Kuba
0f9f1ef4d3 Extract Tarball on boot (#127)
* reworking logic to untar on first boot and reducing sample size for chown logic as it is not recursive

* bad path in arm variants
2019-03-28 22:53:57 +01:00
LinuxServer-CI
d052b13f92 Bot Updating Package Versions 2019-03-28 04:20:14 -04:00
Ryan Kuba
9d64ee4636 #72 fix chowning (#125)
* #72 only chown once using new logic, rebase to alpine 3.9, increase make threads now that arm boxes are single threaded

* typo
2019-03-28 08:02:54 +01:00
8 changed files with 201 additions and 173 deletions

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine:3.8 as buildstage FROM lsiobase/alpine:3.9 as buildstage
############## build stage ############## ############## build stage ##############
# package versions # package versions
@@ -137,7 +137,7 @@ RUN \
sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \ sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
PERL5LIB=`pwd` && \ PERL5LIB=`pwd` && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \ echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make && \ make -j 2 && \
make test && \ make test && \
make DESTDIR=/tmp/xmltv-build install make DESTDIR=/tmp/xmltv-build install
@@ -184,7 +184,7 @@ RUN \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/config && \ --sysconfdir=/config && \
make && \ make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install make DESTDIR=/tmp/tvheadend-build install
RUN \ RUN \
@@ -202,7 +202,7 @@ RUN \
cd /tmp/argtable && \ cd /tmp/argtable && \
./configure \ ./configure \
--prefix=/usr && \ --prefix=/usr && \
make && \ make -j 2 && \
make check && \ make check && \
make DESTDIR=/tmp/argtable-build install && \ make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \ echo "**** copy to /usr for comskip dependency ****" && \
@@ -216,11 +216,11 @@ RUN \
./configure \ ./configure \
--bindir=/usr/bin \ --bindir=/usr/bin \
--sysconfdir=/config/comskip && \ --sysconfdir=/config/comskip && \
make && \ make -j 2 && \
make DESTDIR=/tmp/comskip-build install make DESTDIR=/tmp/comskip-build install
############## runtime stage ############## ############## runtime stage ##############
FROM lsiobase/alpine:3.8 FROM lsiobase/alpine:3.9
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -240,11 +240,11 @@ RUN \
ffmpeg \ ffmpeg \
ffmpeg-libs \ ffmpeg-libs \
gzip \ gzip \
libcrypto1.0 \ libcrypto1.1 \
libcurl \ libcurl \
libdvbcsa \ libdvbcsa \
libhdhomerun-libs \ libhdhomerun-libs \
libssl1.0 \ libssl1.1 \
libva \ libva \
libva-intel-driver \ libva-intel-driver \
libvpx \ libvpx \
@@ -320,14 +320,8 @@ RUN \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
/tmp/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
tar xf \
/tmp/picons.tar.bz2 -C \
/picons && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
# copy local files and buildstage artifacts # copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ COPY --from=buildstage /tmp/argtable-build/usr/ /usr/

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine:arm64v8-3.8 as buildstage FROM lsiobase/alpine:arm64v8-3.9 as buildstage
############## build stage ############## ############## build stage ##############
# package versions # package versions
@@ -136,7 +136,7 @@ RUN \
sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \ sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
PERL5LIB=`pwd` && \ PERL5LIB=`pwd` && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \ echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make && \ make -j 2 && \
make test && \ make test && \
make DESTDIR=/tmp/xmltv-build install make DESTDIR=/tmp/xmltv-build install
@@ -182,7 +182,7 @@ RUN \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/config && \ --sysconfdir=/config && \
make && \ make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install make DESTDIR=/tmp/tvheadend-build install
RUN \ RUN \
@@ -200,7 +200,7 @@ RUN \
cd /tmp/argtable && \ cd /tmp/argtable && \
./configure \ ./configure \
--prefix=/usr && \ --prefix=/usr && \
make && \ make -j 2 && \
make check && \ make check && \
make DESTDIR=/tmp/argtable-build install && \ make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \ echo "**** copy to /usr for comskip dependency ****" && \
@@ -214,11 +214,11 @@ RUN \
./configure \ ./configure \
--bindir=/usr/bin \ --bindir=/usr/bin \
--sysconfdir=/config/comskip && \ --sysconfdir=/config/comskip && \
make && \ make -j 2 && \
make DESTDIR=/tmp/comskip-build install make DESTDIR=/tmp/comskip-build install
############## runtime stage ############## ############## runtime stage ##############
FROM lsiobase/alpine:arm64v8-3.8 FROM lsiobase/alpine:arm64v8-3.9
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -238,11 +238,11 @@ RUN \
ffmpeg \ ffmpeg \
ffmpeg-libs \ ffmpeg-libs \
gzip \ gzip \
libcrypto1.0 \ libcrypto1.1 \
libcurl \ libcurl \
libdvbcsa \ libdvbcsa \
libhdhomerun-libs \ libhdhomerun-libs \
libssl1.0 \ libssl1.1 \
libvpx \ libvpx \
libxml2 \ libxml2 \
libxslt \ libxslt \
@@ -316,14 +316,8 @@ RUN \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
/tmp/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
tar xf \
/tmp/picons.tar.bz2 -C \
/picons && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
# copy local files and buildstage artifacts # copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ COPY --from=buildstage /tmp/argtable-build/usr/ /usr/

View File

@@ -1,4 +1,4 @@
FROM lsiobase/alpine:arm32v7-3.8 as buildstage FROM lsiobase/alpine:arm32v7-3.9 as buildstage
############## build stage ############## ############## build stage ##############
# package versions # package versions
@@ -136,7 +136,7 @@ RUN \
sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \ sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
PERL5LIB=`pwd` && \ PERL5LIB=`pwd` && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \ echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make && \ make -j 2 && \
make test && \ make test && \
make DESTDIR=/tmp/xmltv-build install make DESTDIR=/tmp/xmltv-build install
@@ -182,7 +182,7 @@ RUN \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/config && \ --sysconfdir=/config && \
make && \ make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install make DESTDIR=/tmp/tvheadend-build install
RUN \ RUN \
@@ -200,7 +200,7 @@ RUN \
cd /tmp/argtable && \ cd /tmp/argtable && \
./configure \ ./configure \
--prefix=/usr && \ --prefix=/usr && \
make && \ make -j 2 && \
make check && \ make check && \
make DESTDIR=/tmp/argtable-build install && \ make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \ echo "**** copy to /usr for comskip dependency ****" && \
@@ -214,11 +214,11 @@ RUN \
./configure \ ./configure \
--bindir=/usr/bin \ --bindir=/usr/bin \
--sysconfdir=/config/comskip && \ --sysconfdir=/config/comskip && \
make && \ make -j 2 && \
make DESTDIR=/tmp/comskip-build install make DESTDIR=/tmp/comskip-build install
############## runtime stage ############## ############## runtime stage ##############
FROM lsiobase/alpine:arm32v7-3.8 FROM lsiobase/alpine:arm32v7-3.9
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -238,11 +238,11 @@ RUN \
ffmpeg \ ffmpeg \
ffmpeg-libs \ ffmpeg-libs \
gzip \ gzip \
libcrypto1.0 \ libcrypto1.1 \
libcurl \ libcurl \
libdvbcsa \ libdvbcsa \
libhdhomerun-libs \ libhdhomerun-libs \
libssl1.0 \ libssl1.1 \
libvpx \ libvpx \
libxml2 \ libxml2 \
libxslt \ libxslt \
@@ -316,14 +316,8 @@ RUN \
echo "**** Add Picons ****" && \ echo "**** Add Picons ****" && \
mkdir -p /picons && \ mkdir -p /picons && \
curl -o \ curl -o \
/tmp/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
tar xf \
/tmp/picons.tar.bz2 -C \
/picons && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
# copy local files and buildstage artifacts # copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ COPY --from=buildstage /tmp/argtable-build/usr/ /usr/

28
Jenkinsfile vendored
View File

@@ -38,7 +38,7 @@ pipeline {
script{ script{
env.EXIT_STATUS = '' env.EXIT_STATUS = ''
env.LS_RELEASE = sh( env.LS_RELEASE = sh(
script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''', 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' || : ''',
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' ''',
@@ -240,7 +240,7 @@ pipeline {
fi fi
mkdir -p ${TEMPDIR}/gitbook mkdir -p ${TEMPDIR}/gitbook
git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
if [ "${BRANCH_NAME}" = "master" ] && [ ! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md ] || [ "$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" ]; then if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
cd ${TEMPDIR}/gitbook/docker-documentation/ cd ${TEMPDIR}/gitbook/docker-documentation/
git add images/docker-${CONTAINER_NAME}.md git add images/docker-${CONTAINER_NAME}.md
@@ -315,15 +315,13 @@ pipeline {
sh '''#! /bin/bash sh '''#! /bin/bash
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
''' '''
sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static"
sh "chmod +x qemu-*"
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
--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}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
sh '''docker rmi \ sh '''docker rmi \
${IMAGE}:arm32v7-${META_TAG} \ ${IMAGE}:arm32v7-${META_TAG} \
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ''' lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
} }
} }
} }
@@ -344,15 +342,13 @@ pipeline {
sh '''#! /bin/bash sh '''#! /bin/bash
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
''' '''
sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static"
sh "chmod +x qemu-*"
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
--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 \ sh '''docker rmi \
${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-${META_TAG} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
} }
} }
} }
@@ -516,7 +512,7 @@ pipeline {
sh "docker push ${IMAGE}:${META_TAG}" sh "docker push ${IMAGE}:${META_TAG}"
sh '''docker rmi \ sh '''docker rmi \
${IMAGE}:${META_TAG} \ ${IMAGE}:${META_TAG} \
${IMAGE}:latest ''' ${IMAGE}:latest || :'''
} }
} }
@@ -573,7 +569,7 @@ pipeline {
${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-${META_TAG} \
${IMAGE}:arm64v8-latest \ ${IMAGE}:arm64v8-latest \
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
} }
} }
} }
@@ -582,25 +578,25 @@ pipeline {
when { when {
branch "master" branch "master"
expression { expression {
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
} }
environment name: 'CHANGE_ID', value: '' environment name: 'CHANGE_ID', value: ''
environment name: 'EXIT_STATUS', value: '' environment name: 'EXIT_STATUS', value: ''
} }
steps { steps {
echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}"
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}'-pkg-'${PACKAGE_TAG}'-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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
"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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"target_commitish": "master",\ "target_commitish": "master",\
"name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-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
paste -d'\\0' start releasebody.json > releasebody.json.done paste -d'\\0' start releasebody.json > releasebody.json.done

View File

@@ -227,15 +227,6 @@ 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 all images: `docker-compose pull` * Update all images: `docker-compose pull`
* or update a single image: `docker-compose pull tvheadend` * or update a single image: `docker-compose pull tvheadend`
@@ -243,8 +234,38 @@ Below are the instructions for updating containers:
* or update a single container: `docker-compose up -d tvheadend` * 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`
### Via Watchtower 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 run:
```
docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
containrrr/watchtower \
--run-once tvheadend
```
* You can also remove the old dangling images: `docker image prune`
## Building locally
If you want to make local modifications to these images for development purposes or just to customize the logic:
```
git clone https://github.com/linuxserver/docker-tvheadend.git
cd docker-tvheadend
docker build \
--no-cache \
--pull \
-t linuxserver/tvheadend:latest .
```
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
```
docker run --rm --privileged multiarch/qemu-user-static:register --reset
```
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
## Versions ## Versions
* **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. * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
* **01.03.19:** - Bump xmltv to 0.6.1. * **01.03.19:** - Bump xmltv to 0.6.1.
* **28.02.19:** - add perl-lwp-useragent-determined. * **28.02.19:** - add perl-lwp-useragent-determined.

View File

@@ -1,104 +1,103 @@
alpine-baselayout-3.1.0-r0 alpine-baselayout-3.1.0-r3
alpine-keys-2.1-r1 alpine-keys-2.1-r1
alsa-lib-1.1.6-r0 alsa-lib-1.1.8-r0
apk-tools-2.10.1-r0 apk-tools-2.10.3-r1
bash-4.4.19-r1 bash-4.4.19-r1
bsd-compat-headers-0.7.1-r0 bsd-compat-headers-0.7.1-r0
busybox-1.28.4-r3 busybox-1.29.3-r10
bzip2-1.0.6-r6 bzip2-1.0.6-r6
ca-certificates-20171114-r3 ca-certificates-20190108-r0
coreutils-8.29-r2 ca-certificates-cacert-20190108-r0
curl-7.61.1-r2 coreutils-8.30-r0
expat-2.2.5-r0 curl-7.64.0-r1
ffmpeg-3.4.4-r1 expat-2.2.6-r0
ffmpeg-libs-3.4.4-r1 ffmpeg-4.0.2-r0
fontconfig-2.12.6-r1 ffmpeg-libs-4.0.2-r0
freetype-2.9.1-r1 fontconfig-2.13.1-r0
fribidi-1.0.2-r0 freetype-2.9.1-r2
fribidi-1.0.5-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.2-r0 gnutls-3.6.7-r0
gzip-1.9-r0 gzip-1.10-r0
lame-3.100-r0 lame-3.100-r0
libacl-2.2.52-r5 libacl-2.2.52-r5
libass-0.13.7-r1 libass-0.14.0-r0
libattr-2.4.47-r7 libattr-2.4.47-r7
libbsd-0.8.6-r2 libbsd-0.8.6-r2
libbz2-1.0.6-r6 libbz2-1.0.6-r6
libc-utils-0.7.1-r0 libc-utils-0.7.1-r0
libcrypto1.0-1.0.2r-r0 libcrypto1.1-1.1.1b-r1
libcurl-7.61.1-r2 libcurl-7.64.0-r1
libdrm-2.4.92-r0 libdrm-2.4.96-r0
libdvbcsa-1.1.0-r1 libdvbcsa-1.1.0-r1
libffi-3.2.1-r4 libffi-3.2.1-r6
libgcc-6.4.0-r9 libgcc-8.3.0-r0
libgcrypt-1.8.3-r0 libgcrypt-1.8.4-r0
libgpg-error-1.30-r0 libgpg-error-1.33-r0
libhdhomerun-libs-20161117-r1 libhdhomerun-libs-20161117-r1
libidn-1.34-r1 libidn-1.35-r0
libjpeg-turbo-1.5.3-r4 libjpeg-turbo-1.5.3-r4
libogg-1.3.3-r2 libogg-1.3.3-r2
libpciaccess-0.13.5-r1 libpciaccess-0.14-r0
libpng-1.6.34-r1 libpng-1.6.35-r0
libressl2.7-libcrypto-2.7.5-r0 libssh2-1.8.2-r0
libressl2.7-libssl-2.7.5-r0 libssl1.1-1.1.1b-r1
libressl2.7-libtls-2.7.5-r0 libstdc++-8.3.0-r0
librtmp-2.4_git20160909-r5
libssh2-1.8.1-r0
libssl1.0-1.0.2r-r0
libstdc++-6.4.0-r9
libtasn1-4.13-r0 libtasn1-4.13-r0
libtheora-1.1.1-r13 libtheora-1.1.1-r13
libunistring-0.9.7-r0 libtls-standalone-2.7.4-r6
libva-2.1.0-r1 libunistring-0.9.10-r0
libva-intel-driver-2.1.0-r0 libuuid-2.33-r0
libvdpau-1.1.1-r1 libva-2.2.0-r0
libva-intel-driver-2.2.0-r0
libvdpau-1.1.1-r2
libvorbis-1.3.6-r2 libvorbis-1.3.6-r2
libvpx-1.6.1-r0 libvpx-1.6.1-r1
libx11-1.6.6-r0 libx11-1.6.7-r0
libxau-1.0.8-r2 libxau-1.0.8-r3
libxcb-1.13-r2 libxcb-1.13-r2
libxdmcp-1.1.2-r4 libxdmcp-1.1.2-r5
libxext-1.3.3-r2 libxext-1.3.3-r3
libxfixes-5.0.3-r1 libxfixes-5.0.3-r2
libxml2-2.9.8-r1 libxml2-2.9.9-r1
libxslt-1.1.32-r0 libxslt-1.1.33-r1
linux-headers-4.4.6-r2 linux-headers-4.18.13-r1
linux-pam-1.3.0-r0 linux-pam-1.3.0-r0
musl-1.1.19-r10 musl-1.1.20-r4
musl-utils-1.1.19-r10 musl-utils-1.1.20-r4
ncurses-libs-6.1_p20180818-r1 ncurses-libs-6.1_p20190105-r0
ncurses-terminfo-6.1_p20180818-r1 ncurses-terminfo-6.1_p20190105-r0
ncurses-terminfo-base-6.1_p20180818-r1 ncurses-terminfo-base-6.1_p20190105-r0
nettle-3.4-r1 nettle-3.4.1-r0
nghttp2-libs-1.32.0-r0 nghttp2-libs-1.35.1-r0
openssl-1.0.2r-r0 openssl-1.1.1b-r1
opus-1.2.1-r1 opus-1.3-r0
p11-kit-0.23.10-r0 p11-kit-0.23.14-r0
pcre2-10.31-r0 pcre2-10.32-r1
perl-5.26.3-r0 perl-5.26.3-r0
perl-archive-zip-1.60-r0 perl-archive-zip-1.64-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-capture-tiny-0.48-r0 perl-capture-tiny-0.48-r0
perl-cgi-4.38-r0 perl-cgi-4.40-r0
perl-class-data-inheritable-0.08-r0 perl-class-data-inheritable-0.08-r0
perl-class-inspector-1.28-r1 perl-class-inspector-1.32-r0
perl-class-methodmaker-2.24-r2 perl-class-methodmaker-2.24-r2
perl-class-singleton-1.5-r0 perl-class-singleton-1.5-r0
perl-compress-raw-bzip2-2.081-r0 perl-compress-raw-bzip2-2.084-r0
perl-compress-raw-zlib-2.081-r0 perl-compress-raw-zlib-2.084-r0
perl-cpan-meta-check-0.014-r1 perl-cpan-meta-check-0.014-r1
perl-data-dumper-2.161-r2 perl-data-dumper-2.173-r0
perl-date-manip-6.70-r0 perl-date-manip-6.75-r1
perl-datetime-1.44-r0 perl-datetime-1.44-r0
perl-datetime-format-strptime-1.74-r0 perl-datetime-format-strptime-1.74-r0
perl-datetime-locale-1.18-r0 perl-datetime-locale-1.22-r0
perl-datetime-timezone-2.19-r0 perl-datetime-timezone-2.19-r0
perl-dbd-sqlite-1.58-r0 perl-dbd-sqlite-1.62-r0
perl-dbi-1.641-r0 perl-dbi-1.642-r0
perl-devel-stacktrace-2.02-r0 perl-devel-stacktrace-2.03-r0
perl-devel-symdump-2.18-r0 perl-devel-symdump-2.18-r0
perl-digest-sha1-2.13-r9 perl-digest-sha1-2.13-r9
perl-dist-checkconflicts-0.11-r1 perl-dist-checkconflicts-0.11-r1
@@ -106,12 +105,12 @@ perl-doc-5.26.3-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
perl-exporter-tiny-1.000000-r0 perl-exporter-tiny-1.002001-r0
perl-file-listing-6.04-r1 perl-file-listing-6.04-r1
perl-file-sharedir-1.106-r0 perl-file-sharedir-1.116-r0
perl-file-sharedir-install-0.11-r0 perl-file-sharedir-install-0.13-r0
perl-file-slurp-9999.19-r0 perl-file-slurp-9999.25-r0
perl-file-temp-0.2304-r0 perl-file-temp-0.2308-r0
perl-file-which-1.22-r0 perl-file-which-1.22-r0
perl-getopt-long-2.50-r0 perl-getopt-long-2.50-r0
perl-html-parser-3.72-r2 perl-html-parser-3.72-r2
@@ -120,17 +119,17 @@ perl-html-tree-5.07-r0
perl-http-cookies-6.04-r0 perl-http-cookies-6.04-r0
perl-http-daemon-6.01-r1 perl-http-daemon-6.01-r1
perl-http-date-6.02-r1 perl-http-date-6.02-r1
perl-http-message-6.15-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-r4 perl-io-1.25-r4
perl-io-compress-2.081-r0 perl-io-compress-2.084-r0
perl-io-html-1.001-r1 perl-io-html-1.001-r1
perl-io-socket-ssl-2.048-r1 perl-io-socket-ssl-2.060-r0
perl-io-stringy-2.111-r1 perl-io-stringy-2.111-r1
perl-ipc-run3-0.048-r0 perl-ipc-run3-0.048-r0
perl-json-2.97000-r0 perl-json-2.97000-r0
perl-libwww-6.34-r0 perl-libwww-6.36-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.419-r1 perl-list-moreutils-0.419-r1
@@ -139,23 +138,24 @@ perl-lwp-useragent-determined-1.07-r0
perl-module-build-0.4224-r0 perl-module-build-0.4224-r0
perl-module-implementation-0.09-r1 perl-module-implementation-0.09-r1
perl-module-pluggable-5.2-r0 perl-module-pluggable-5.2-r0
perl-module-runtime-0.016-r0 perl-module-runtime-0.016-r1
perl-mro-compat-0.13-r0 perl-mro-compat-0.13-r0
perl-namespace-autoclean-0.28-r0 perl-namespace-autoclean-0.28-r0
perl-namespace-clean-0.27-r0 perl-namespace-clean-0.27-r0
perl-net-http-6.09-r1 perl-net-http-6.09-r1
perl-net-libidn-0.12-r4 perl-net-libidn-0.12-r5
perl-net-ssleay-1.85-r1 perl-net-ssleay-1.85-r4
perl-package-deprecationmanager-0.17-r0 perl-package-deprecationmanager-0.17-r0
perl-package-stash-0.37-r0 perl-package-stash-0.37-r0
perl-package-stash-xs-0.28-r4 perl-package-stash-xs-0.28-r4
perl-params-classify-0.015-r0
perl-params-util-1.07-r5 perl-params-util-1.07-r5
perl-params-validate-1.28-r0 perl-params-validate-1.29-r0
perl-params-validationcompiler-0.24-r1 perl-params-validationcompiler-0.27-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.000005-r0 perl-role-tiny-2.000006-r0
perl-scalar-list-utils-1.50-r0 perl-scalar-list-utils-1.50-r0
perl-scope-guard-0.21-r0 perl-scope-guard-0.21-r0
perl-specio-0.42-r0 perl-specio-0.42-r0
@@ -174,7 +174,7 @@ perl-test-fatal-0.014-r1
perl-test-needs-0.002005-r1 perl-test-needs-0.002005-r1
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.302136-r0 perl-test-simple-1.302141-r0
perl-test-taint-1.06-r5 perl-test-taint-1.06-r5
perl-test-warnings-0.026-r0 perl-test-warnings-0.026-r0
perl-test-without-module-0.20-r0 perl-test-without-module-0.20-r0
@@ -183,7 +183,7 @@ perl-test2-suite-0.000114-r0
perl-timedate-2.30-r1 perl-timedate-2.30-r1
perl-try-tiny-0.30-r0 perl-try-tiny-0.30-r0
perl-unicode-string-2.09-r6 perl-unicode-string-2.09-r6
perl-uri-1.72-r0 perl-uri-1.74-r0
perl-variable-magic-0.62-r0 perl-variable-magic-0.62-r0
perl-www-robotrules-6.02-r1 perl-www-robotrules-6.02-r1
perl-xml-libxml-2.0132-r1 perl-xml-libxml-2.0132-r1
@@ -195,22 +195,23 @@ 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.30-r1 perl-yaml-syck-1.31-r0
python2-2.7.15-r1 python2-2.7.15-r3
readline-7.0.003-r0 readline-7.0.003-r1
scanelf-1.2.3-r0 scanelf-1.2.3-r0
sdl2-2.0.8-r1 sdl2-2.0.9-r0
shadow-4.5-r0 shadow-4.5-r0
sqlite-libs-3.25.3-r0 sqlite-libs-3.26.0-r3
ssl_client-1.28.4-r3 ssl_client-1.29.3-r10
tar-1.32-r0 tar-1.32-r0
tzdata-2018f-r0 tzdata-2019a-r0
uriparser-0.8.5-r0 uriparser-0.9.1-r0
v4l-utils-libs-1.12.6-r1 v4l-utils-libs-1.16.2-r0
wget-1.20.1-r0 wget-1.20.3-r0
x264-20180304-r1 x264-20180304-r1
x264-libs-20180304-r1 x264-libs-20180304-r1
x265-2.7-r1 x265-2.8-r1
x265-libs-2.8-r1
xvidcore-1.3.4-r1 xvidcore-1.3.4-r1
xz-5.2.4-r0 xz-5.2.4-r0
xz-libs-5.2.4-r0 xz-libs-5.2.4-r0

View File

@@ -125,6 +125,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { 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: "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: "01.03.19:", desc: "Bump xmltv to 0.6.1." }
- { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." } - { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." }

View File

@@ -12,8 +12,35 @@ mkdir -p \
[[ ! -e /config/config ]] && \ [[ ! -e /config/config ]] && \
(cp /defaults/config /config/config) (cp /defaults/config /config/config)
# extract picons on first run
[[ -f /picons.tar.bz2 ]] && \
tar xf \
/picons.tar.bz2 -C \
/picons &&
rm -f /picons.tar.bz2
# permissions # function to randomly sample 5 files for their owner and only chown if not abc
chown -R abc:abc \ chowner () {
/config \ files=(${1}/*)
/picons for i in {1..5}; do
user=$(stat -c '%U' $(printf "%s\n" "${files[RANDOM % ${#files[@]}]}"))
if [ "${user}" != "abc" ]; then
chown -R abc:abc ${1}
break
fi
done
}
# permissions
echo "Setting permissions"
abc_dirs=( \
/config \
/picons \
)
for i in "${abc_dirs[@]}"; do
if [ "$(ls -A ${i})" ]; then
chowner ${i}
else
chown -R abc:abc ${i}
fi
done