From bc9f9ea6ed58fb7209a218b751bb6fbed7a7b8ec Mon Sep 17 00:00:00 2001 From: DaveO16176 Date: Mon, 17 Jun 2024 05:42:58 -0400 Subject: [PATCH] emby: mediainfo-plugin initial release --- .github/workflows/BuildImage.yml | 6 +-- Dockerfile | 2 +- Dockerfile.complex | 33 ---------------- README.md | 39 +++++++++---------- .../dependencies.d/init-mods | 0 .../run | 25 ++++++++++++ .../type | 0 .../up | 1 + .../dependencies.d/init-mods-package-install | 0 .../run | 8 +++- .../type | 0 .../up | 1 + .../run | 30 -------------- .../init-mod-imagename-modname-add-package/up | 1 - .../init-mod-imagename-modname-install/up | 1 - ...nit-mod-emby-mediainfo-plugin-postinstall} | 0 ...nit-mod-emby-mediainfo-plugin-add-package} | 0 .../s6-rc.d/svc-mod-imagename-modname/run | 7 ---- .../s6-rc.d/svc-mod-imagename-modname/type | 1 - ...nit-mod-emby-mediainfo-plugin-add-package} | 0 ...nit-mod-emby-mediainfo-plugin-postinstall} | 0 .../init-mod-imagename-modname-install | 0 .../user/contents.d/svc-mod-imagename-modname | 0 23 files changed, 56 insertions(+), 99 deletions(-) delete mode 100644 Dockerfile.complex rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-add-package => init-mod-emby-mediainfo-plugin-add-package}/dependencies.d/init-mods (100%) create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/run rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-add-package => init-mod-emby-mediainfo-plugin-add-package}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/up rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-install => init-mod-emby-mediainfo-plugin-postinstall}/dependencies.d/init-mods-package-install (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-install => init-mod-emby-mediainfo-plugin-postinstall}/run (54%) rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-install => init-mod-emby-mediainfo-plugin-postinstall}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/up delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up rename root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/{init-mod-imagename-modname-install => init-mod-emby-mediainfo-plugin-postinstall} (100%) rename root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/{init-mod-imagename-modname-add-package => init-mod-emby-mediainfo-plugin-add-package} (100%) delete mode 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type rename root/etc/s6-overlay/s6-rc.d/{svc-mod-imagename-modname/dependencies.d/init-services => user/contents.d/init-mod-emby-mediainfo-plugin-add-package} (100%) rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{init-mod-imagename-modname-add-package => init-mod-emby-mediainfo-plugin-postinstall} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 6008e85..cae720a 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -5,9 +5,9 @@ on: [push, pull_request_target, workflow_dispatch] env: GITHUB_REPO: "linuxserver/docker-mods" #don't modify ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "replace_baseimage" #replace - MODNAME: "replace_modname" #replace - MULTI_ARCH: "true" #set to false if not needed + BASEIMAGE: "emby" #replace + MODNAME: "mediainfo-plugin" #replace + MULTI_ARCH: "false" #set to false if not needed jobs: set-vars: diff --git a/Dockerfile b/Dockerfile index aa66170..87d6e6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="DaveO16176" # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index eb80898..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,33 +0,0 @@ -# syntax=docker/dockerfile:1 - -## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage - -RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl && \ - echo "**** grab rclone ****" && \ - mkdir -p /root-layer && \ - if [ $(uname -m) = "x86_64" ]; then \ - echo "Downloading x86_64 tarball" && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb"; \ - elif [ $(uname -m) = "aarch64" ]; then \ - echo "Downloading aarch64 tarball" && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-arm64.deb"; \ - fi && \ - -# copy local files -COPY root/ /root-layer/ - -## Single layer deployed image ## -FROM scratch - -LABEL maintainer="username" - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 1700668..a72d279 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,24 @@ -# Rsync - Docker mod for openssh-server +# MediaInfo Plugin Support - Docker mod for Emby -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds support for the Emby's MediaInfo plugin https://github.com/Cheesegeezer/MediaInfoWiki/wiki for Linuxserver.io's Emby container https://github.com/linuxserver/docker-emby. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +Supports the Ubuntu version of the Emby container. This mod will only work on amd64 because the Roku BIF file creation tool is compiled only for Linux x86 64-bit machines. See https://developer.roku.com/en-gb/docs/developer-program/media-playback/trick-mode/bif-file-creation.md for more information. -If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2` +In Emby Docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:emby-mediaserver`, such as: +- docker-compose: + ```yaml + environment: + - DOCKER_MODS=linuxserver/mods:emby-mediaserver-plugin + ``` +- docker cli: + ```sh + -e DOCKER_MODS=linuxserver/mods:emby-mediaserver-plugin + ``` -# Mod creation instructions +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:emby-mediaserver-plugin|linuxserver/mods:universal-mod2` -* Fork the repo, create a new branch based on the branch `template`. -* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done. -* Inspect the `root` folder contents. Edit, add and remove as necessary. -* After all init scripts and services are created, run `find ./ -path "./.git" -prune -o \( -name "run" -o -name "finish" -o -name "check" \) -not -perm -u=x,g=x,o=x -print -exec chmod +x {} +` to fix permissions. -* Edit this readme with pertinent info, delete these instructions. -* Finally edit the `.github/workflows/BuildImage.yml`. Customize the vars for `BASEIMAGE` and `MODNAME`. Set the versioning logic and `MULTI_ARCH` if needed. -* Ask the team to create a new branch named `-`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch. -* Submit PR against the branch created by the team. - - -## Tips and tricks - -* Some images have helpers built in, these images are currently: - * [Openvscode-server](https://github.com/linuxserver/docker-openvscode-server/pull/10/files) - * [Code-server](https://github.com/linuxserver/docker-code-server/pull/95) +# Settings in Emby +Configure the Media Toolbox plugin, applications installed will be located as follows: +- MediaInfoCL in `/usr/bin/mediainfo` +- MKVPropEdit in `/usr/bin/mkvpropedit` +- BifTool in `/usr/bin/biftool` diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/run new file mode 100755 index 0000000..96d7d02 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/run @@ -0,0 +1,25 @@ +#!/usr/bin/with-contenv bash + +# This is the init file used for adding os or pip packages to install lists. +# It takes advantage of the built-in init-mods-package-install init script that comes with the baseimages. +# If using this, we need to make sure we set this init as a dependency of init-mods-package-install so this one runs first + +# Determine if setup is needed +if [ ! -f /usr/bin/apt ]; then + echo "**** Image is not Ubuntu, exiting emby-mediainfo-plugin install. ****" + exit 0 +fi + +if [ $(uname -m) != "x86_64" ]; then + echo "**** MediaInfo plugin only works on x86_64, see README for more info. Exiting emby-mediainfo-plugin install. ****" + exit 0 +fi + +# Ubuntu +if [ -f /usr/bin/apt ]; then + echo "**** Installing packages ****" + echo "\ + mediainfo \ + mkvtoolnix \ + unzip" >> /mod-repo-packages-to-install.list +fi \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/up new file mode 100644 index 0000000..3139331 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/dependencies.d/init-mods-package-install similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/dependencies.d/init-mods-package-install rename to root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/dependencies.d/init-mods-package-install diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/run similarity index 54% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run rename to root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/run index 59a4b77..8467dd3 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/run @@ -4,5 +4,9 @@ # so it can take advantage of packages installed # init-mods-end depends on this script so that later init and services wait until this script exits -echo "**** Setting up apprise ****" -apprise blah blah +echo "**** Installing BIF Tool ****" +curl -L \ + "https://github.com/rokudev/samples/raw/master/utilities/bif%20tool/biftool_linux.zip" \ + -o /tmp/biftool_linux.zip && \ + cd /tmp && \ + unzip biftool_linux.zip -d /usr/bin \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/up b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/up new file mode 100644 index 0000000..6b29936 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-emby-mediainfo-plugin-postinstall/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run deleted file mode 100755 index 063b570..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is the init file used for adding os or pip packages to install lists. -# It takes advantage of the built-in init-mods-package-install init script that comes with the baseimages. -# If using this, we need to make sure we set this init as a dependency of init-mods-package-install so this one runs first - -if ! command -v apprise; then - echo "**** Adding apprise and its deps to package install lists ****" - echo "apprise" >> /mod-pip-packages-to-install.list - ## Ubuntu - if [ -f /usr/bin/apt ]; then - echo "\ - python3 \ - python3-pip \ - runc" >> /mod-repo-packages-to-install.list - fi - # Alpine - if [ -f /sbin/apk ]; then - echo "\ - cargo \ - libffi-dev \ - openssl-dev \ - python3 \ - python3-dev \ - python3 \ - py3-pip" >> /mod-repo-packages-to-install.list - fi -else - echo "**** apprise already installed, skipping ****" -fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up deleted file mode 100644 index 6414139..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up deleted file mode 100644 index 03d298d..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-imagename-modname-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-emby-mediainfo-plugin-postinstall similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-imagename-modname-install rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-emby-mediainfo-plugin-postinstall diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-emby-mediainfo-plugin-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-emby-mediainfo-plugin-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run deleted file mode 100755 index 02ffe39..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is an example service that would run for the mod -# It depends on init-services, the baseimage hook for start of all longrun services - -exec \ - s6-setuidgid abc run my app diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type deleted file mode 100644 index 1780f9f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-emby-mediainfo-plugin-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-emby-mediainfo-plugin-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-emby-mediainfo-plugin-postinstall similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-emby-mediainfo-plugin-postinstall diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname deleted file mode 100644 index e69de29..0000000