forked from Ivasoft/docker-tvheadend
Compare commits
2 Commits
0a60f73e-l
...
0a60f73e-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bb93b5a30 | ||
|
|
5615df900e |
@@ -242,6 +242,9 @@ Below are the instructions for updating containers:
|
|||||||
containrrr/watchtower \
|
containrrr/watchtower \
|
||||||
--run-once tvheadend
|
--run-once tvheadend
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose.
|
||||||
|
|
||||||
* You can also remove the old dangling images: `docker image prune`
|
* You can also remove the old dangling images: `docker image prune`
|
||||||
|
|
||||||
## Building locally
|
## Building locally
|
||||||
@@ -265,6 +268,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb.
|
||||||
* **28.06.19:** - Rebasing to alpine 3.10.
|
* **28.06.19:** - Rebasing to alpine 3.10.
|
||||||
* **27.03.19:** - Rebase to Alpine 3.9, fix init logic to only chown once.
|
* **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.
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
alpine-baselayout-3.1.2-r0
|
alpine-baselayout-3.1.2-r0
|
||||||
alpine-keys-2.1-r2
|
alpine-keys-2.1-r2
|
||||||
alsa-lib-1.1.9-r0
|
alsa-lib-1.1.9-r0
|
||||||
apk-tools-2.10.4-r1
|
apk-tools-2.10.4-r2
|
||||||
bash-5.0.0-r0
|
bash-5.0.0-r0
|
||||||
bsd-compat-headers-0.7.1-r0
|
bsd-compat-headers-0.7.1-r0
|
||||||
busybox-1.30.1-r2
|
busybox-1.30.1-r2
|
||||||
bzip2-1.0.6-r6
|
bzip2-1.0.6-r7
|
||||||
ca-certificates-20190108-r0
|
ca-certificates-20190108-r0
|
||||||
ca-certificates-cacert-20190108-r0
|
ca-certificates-cacert-20190108-r0
|
||||||
coreutils-8.31-r0
|
coreutils-8.31-r0
|
||||||
@@ -26,14 +26,14 @@ libacl-2.2.52-r6
|
|||||||
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.9.1-r0
|
||||||
libbz2-1.0.6-r6
|
libbz2-1.0.6-r7
|
||||||
libc-utils-0.7.1-r0
|
libc-utils-0.7.1-r0
|
||||||
libcrypto1.1-1.1.1c-r0
|
libcrypto1.1-1.1.1c-r0
|
||||||
libcurl-7.65.1-r0
|
libcurl-7.65.1-r0
|
||||||
libdrm-2.4.98-r0
|
libdrm-2.4.98-r0
|
||||||
libffi-3.2.1-r6
|
libffi-3.2.1-r6
|
||||||
libgcc-8.3.0-r0
|
libgcc-8.3.0-r0
|
||||||
libgcrypt-1.8.4-r1
|
libgcrypt-1.8.4-r2
|
||||||
libgpg-error-1.36-r2
|
libgpg-error-1.36-r2
|
||||||
libhdhomerun-libs-20161117-r1
|
libhdhomerun-libs-20161117-r1
|
||||||
libidn-1.35-r0
|
libidn-1.35-r0
|
||||||
@@ -47,7 +47,7 @@ libressl2.7-libssl-2.7.5-r0
|
|||||||
libressl2.7-libtls-2.7.5-r0
|
libressl2.7-libtls-2.7.5-r0
|
||||||
libssl1.1-1.1.1c-r0
|
libssl1.1-1.1.1c-r0
|
||||||
libstdc++-8.3.0-r0
|
libstdc++-8.3.0-r0
|
||||||
libtasn1-4.13-r0
|
libtasn1-4.14-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
|
||||||
@@ -200,7 +200,7 @@ perl-yaml-syck-1.31-r1
|
|||||||
python2-2.7.16-r1
|
python2-2.7.16-r1
|
||||||
readline-8.0.0-r0
|
readline-8.0.0-r0
|
||||||
scanelf-1.2.3-r0
|
scanelf-1.2.3-r0
|
||||||
sdl2-2.0.9-r0
|
sdl2-2.0.10-r0
|
||||||
shadow-4.6-r2
|
shadow-4.6-r2
|
||||||
sqlite-libs-3.28.0-r0
|
sqlite-libs-3.28.0-r0
|
||||||
ssl_client-1.30.1-r2
|
ssl_client-1.30.1-r2
|
||||||
|
|||||||
@@ -125,6 +125,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }
|
||||||
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
|
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
|
||||||
- { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." }
|
- { date: "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." }
|
||||||
|
|||||||
34
root/etc/cont-init.d/50-gid-video
Normal file
34
root/etc/cont-init.d/50-gid-video
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
|
# check for the existence of a video and/or tuner device
|
||||||
|
if [ -e /dev/dri ] || [ -e /dev/dvb ]; then
|
||||||
|
if [ -e /dev/dri ]; then
|
||||||
|
VIDEO_GID=$(stat -c '%g' /dev/dri/* | grep -v '^0$' | head -n 1)
|
||||||
|
else
|
||||||
|
VIDEO_GID=$(stat -c '%g' /dev/dvb/* | grep -v '^0$' | head -n 1)
|
||||||
|
fi
|
||||||
|
# just add abc to root if stuff in dri/dvb is root owned
|
||||||
|
if [ -z "${VIDEO_GID}" ]; then
|
||||||
|
usermod -a -G root abc
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if this GID matches the current abc user
|
||||||
|
ABCGID=$(getent group abc | awk -F: '{print $3}')
|
||||||
|
if [ "${ABCGID}" == "${VIDEO_GID}" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if the GID is taken and swap to 65533
|
||||||
|
CURRENT=$(getent group ${VIDEO_GID} | awk -F: '{print $1}')
|
||||||
|
if [ -z "${CURRENT}" ] || [ "${CURRENT}" == 'video' ]; then
|
||||||
|
groupmod -g ${VIDEO_GID} video
|
||||||
|
usermod -a -G video abc
|
||||||
|
else
|
||||||
|
groupmod -g 65533 ${CURRENT}
|
||||||
|
groupmod -g ${VIDEO_GID} video
|
||||||
|
usermod -a -G video abc
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user