Merge pull request #38 from mKeRix/lazylibrarian-ffmpeg

lazylibrarian-ffmpeg: initial release

Author: aptalca

.travis.yml

@@ -4,16 +4,16 @@ language: shell
 
 branches:
   only:
-    - <baseimagename>-<modname> #replace variables, omit brackets
+    - lazylibrarian-ffmpeg
 
 services:
   - docker
 
 env:
   global:
-    - DOCKERHUB="linuxserver/mods" #don't modify
-    - BASEIMAGE="baseimagename" #replace
-    - MODNAME="modname" #replace
+    - DOCKERHUB="linuxserver/mods"
+    - BASEIMAGE="lazylibrarian"
+    - MODNAME="ffmpeg"
 
 jobs:
   include:

Dockerfile

@@ -1,4 +1,5 @@
 FROM scratch
 
-# copy local files
-COPY root/ /
+LABEL maintainer="mKeRix"
+
+COPY root/ /

Dockerfile.complex

@@ -1,17 +1,9 @@
-# Rsync - Docker mod for openssh-server
+# ffmpeg - Docker mod for lazylibrarian
 
-This mod adds rsync to openssh-server, to be installed/updated during container start.
+This mod adds ffmpeg to lazylibrarian, to be installed/updated during container start.
 
-In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
+In lazylibrarian docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:lazylibrarian-ffmpeg`
 
-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`
+If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:lazylibrarian-ffmpeg|linuxserver/calibre-web:calibre`
 
-# Mod creation instructions
-
-* Ask the team to create a new branch named `<baseimagename>-<modname>`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch.
-* Fork the repo, checkout the newly created branch.
-* 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.
-* Edit this readme with pertinent info, delete these instructions.
-* Finally edit the `travis.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`.
-* Submit PR against the branch created by the team.
+To enable it you can set the ffmpeg path under Settings > Processing > External Programs to `ffmpeg` in the LazyLibrarian Web UI.

README.md

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** installing ffmpeg ****"
+apt-get update && apt-get install -y ffmpeg