From 53b49652af2f4c84f34dd00131b0cb48ff90adaa Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 23 Mar 2020 11:15:40 -0400 Subject: [PATCH] remove udev hack (no longer needed) --- Dockerfile | 9 ++------- Dockerfile.aarch64 | 9 ++------- Dockerfile.armhf | 9 ++------- readme-vars.yml | 13 ++++++++++--- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2abbd2..0a03b3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,14 +25,10 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ + jq \ udev \ unrar \ - wget \ - jq && \ - echo "**** Udevadm hack ****" && \ - mv /sbin/udevadm /sbin/udevadm.bak && \ - echo "exit 0" > /sbin/udevadm && \ - chmod +x /sbin/udevadm && \ + wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -42,7 +38,6 @@ RUN \ /tmp/plexmediaserver.deb -L \ "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ dpkg -i /tmp/plexmediaserver.deb && \ - mv /sbin/udevadm.bak /sbin/udevadm && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c616315..58d2010 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,14 +22,10 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ + jq \ udev \ unrar \ - wget \ - jq && \ - echo "**** Udevadm hack ****" && \ - mv /sbin/udevadm /sbin/udevadm.bak && \ - echo "exit 0" > /sbin/udevadm && \ - chmod +x /sbin/udevadm && \ + wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -39,7 +35,6 @@ RUN \ /tmp/plexmediaserver.deb -L \ "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ dpkg -i /tmp/plexmediaserver.deb && \ - mv /sbin/udevadm.bak /sbin/udevadm && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a67b05b..5bd94e5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -22,14 +22,10 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ + jq \ udev \ unrar \ - wget \ - jq && \ - echo "**** Udevadm hack ****" && \ - mv /sbin/udevadm /sbin/udevadm.bak && \ - echo "exit 0" > /sbin/udevadm && \ - chmod +x /sbin/udevadm && \ + wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -39,7 +35,6 @@ RUN \ /tmp/plexmediaserver.deb -L \ "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ dpkg -i /tmp/plexmediaserver.deb && \ - mv /sbin/udevadm.bak /sbin/udevadm && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ diff --git a/readme-vars.yml b/readme-vars.yml index 4a1da14..5868762 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -19,9 +19,9 @@ common_param_env_vars_enabled: true #PGID, PUID, etc param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Plex library location. *This can grow very large, 50gb+ is likely for a large collection.*" } - - { vol_path: "/tv", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } - - { vol_path: "/movies", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } + - { vol_path: "/config", vol_host_path: "/path/to/library", desc: "Plex library location. *This can grow very large, 50gb+ is likely for a large collection.*" } + - { vol_path: "/tv", vol_host_path: "/path/to/tvseries", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } + - { vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } param_usage_include_ports: false param_usage_include_net: true param_net: "host" @@ -72,12 +72,18 @@ app_setup_block: | + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **``**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. + ## Hardware Acceleration + + ### Intel + Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: ```--device=/dev/dri:/dev/dri``` We will automatically ensure the abc user inside of the container has the proper permissions to access this device. + ### Nvidia + Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: https://github.com/NVIDIA/nvidia-docker @@ -86,6 +92,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start." } - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`." } - { date: "06.08.19:", desc: "Add variable for setting UMASK." } - { date: "10.07.19:", desc: "Fix permissions for tuner (/dev/dvb) devices." }