From 31ac9486069bcb491ad482945b97f29b0a807d5a Mon Sep 17 00:00:00 2001 From: Heiko Rothe Date: Sat, 9 May 2020 22:24:00 +0200 Subject: [PATCH 1/3] add ffmpeg mod --- .travis.yml | 8 ++++---- Dockerfile | 4 +--- Dockerfile.complex | 21 --------------------- README.md | 18 +++++------------- root/etc/cont-init.d/98-ffmpeg | 4 ++++ root/etc/cont-init.d/98-vpn-config | 27 --------------------------- root/etc/services.d/sshvpn/run | 3 --- 7 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 Dockerfile.complex create mode 100644 root/etc/cont-init.d/98-ffmpeg delete mode 100644 root/etc/cont-init.d/98-vpn-config delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.travis.yml b/.travis.yml index e6e5b1fb..c5cff161 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,16 @@ language: shell branches: only: - - - #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: diff --git a/Dockerfile b/Dockerfile index 2f24b209..b27a5825 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,2 @@ FROM scratch - -# copy local files -COPY root/ / +COPY root/ / \ No newline at end of file diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index 4463d838..00000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,21 +0,0 @@ -## Buildstage ## -FROM lsiobase/alpine:3.9 as buildstage - -RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl && \ - echo "**** grab rclone ****" && \ - mkdir -p /root-layer && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb" - -# copy local files -COPY root/ /root-layer/ - -## Single layer deployed image ## -FROM scratch - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 2418e530..e99ddd3a 100644 --- a/README.md +++ b/README.md @@ -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 `-`. 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. \ No newline at end of file +To enable it you can set the ffmpeg path under Settings > Processing > External Programs to `ffmpeg` in the LazyLibrarian Web UI. diff --git a/root/etc/cont-init.d/98-ffmpeg b/root/etc/cont-init.d/98-ffmpeg new file mode 100644 index 00000000..b5e3dc03 --- /dev/null +++ b/root/etc/cont-init.d/98-ffmpeg @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv bash + +echo "**** installing ffmpeg ****" +apt update && apt install -y ffmpeg \ No newline at end of file diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index a5f91276..00000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/with-contenv bash - -# Determine if setup is needed -if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \ -[ -f /usr/bin/apt ]; then - ## Ubuntu - apt-get update - apt-get install --no-install-recommends -y \ - iptables \ - openssh-client \ - python3 \ - python3-pip - pip3 install sshuttle -fi -if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \ -[ -f /sbin/apk ]; then - # Alpine - apk add --no-cache \ - iptables \ - openssh \ - py3-pip \ - python3 - pip3 install sshuttle -fi - -chown -R root:root /root -chmod -R 600 /root/.ssh diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100644 index 7d49e796..00000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16 From e3738d2208934d1689c6256339435ab35ea992d5 Mon Sep 17 00:00:00 2001 From: Heiko Rothe Date: Sat, 9 May 2020 23:31:04 +0200 Subject: [PATCH 2/3] lazylibrarian-ffmpeg: use apt-get --- root/etc/cont-init.d/98-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/98-ffmpeg b/root/etc/cont-init.d/98-ffmpeg index b5e3dc03..6321ce50 100644 --- a/root/etc/cont-init.d/98-ffmpeg +++ b/root/etc/cont-init.d/98-ffmpeg @@ -1,4 +1,4 @@ #!/usr/bin/with-contenv bash echo "**** installing ffmpeg ****" -apt update && apt install -y ffmpeg \ No newline at end of file +apt-get update && apt-get install -y ffmpeg \ No newline at end of file From 9cd93ca253f458765423b1c8a66523809d67d8b4 Mon Sep 17 00:00:00 2001 From: Heiko Rothe Date: Sat, 9 May 2020 23:31:24 +0200 Subject: [PATCH 3/3] lazylibrarian-ffmpeg: add maintainer label --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index b27a5825..7271c5b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,5 @@ FROM scratch + +LABEL maintainer="mKeRix" + COPY root/ / \ No newline at end of file