From 627191c23e182621bdbd40cff90f832753f8e82e Mon Sep 17 00:00:00 2001
From: Matthew Barbour <matthew@darkholme.net>
Date: Thu, 13 Aug 2020 10:33:40 -0500
Subject: [PATCH 1/2] swag ffmpeg mod initial commit

---
 .travis.yml                        |  6 +++---
 Dockerfile.complex                 | 21 ---------------------
 README.md                          | 18 ++++--------------
 root/etc/cont-init.d/98-ffmpeg     |  5 +++++
 root/etc/cont-init.d/98-vpn-config | 27 ---------------------------
 root/etc/services.d/sshvpn/run     |  3 ---
 6 files changed, 12 insertions(+), 68 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 e6e5b1f..9cd906f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: shell
 
 branches:
   only:
-    - <baseimagename>-<modname> #replace variables, omit brackets
+    - swag-ffmpeg 
 
 services:
   - docker
@@ -12,8 +12,8 @@ services:
 env:
   global:
     - DOCKERHUB="linuxserver/mods" #don't modify
-    - BASEIMAGE="baseimagename" #replace
-    - MODNAME="modname" #replace
+    - BASEIMAGE="swag" 
+    - MODNAME="ffmpeg" 
 
 jobs:
   include:
diff --git a/Dockerfile.complex b/Dockerfile.complex
deleted file mode 100644
index 4463d83..0000000
--- 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 2418e53..a3c272f 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,7 @@
-# Rsync - Docker mod for openssh-server
+# Ffmpeg - Docker mod for swag
 
-This mod adds rsync to openssh-server, to be installed/updated during container start.
+This mod adds ffmpeg to swag, to be installed/updated during container start.
 
-In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
+In swag docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:swag-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`
-
-# 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.
\ No newline at end of file
+If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:swag-ffmpeg|linuxserver/mods:swag-mod2`
diff --git a/root/etc/cont-init.d/98-ffmpeg b/root/etc/cont-init.d/98-ffmpeg
new file mode 100644
index 0000000..457ffd2
--- /dev/null
+++ b/root/etc/cont-init.d/98-ffmpeg
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** installing ffmpeg ****"
+apk add --no-cache \
+  ffmpeg
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 a5f9127..0000000
--- 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 7d49e79..0000000
--- 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 d60727d9c3c669d565b800e124ab7055b1563de7 Mon Sep 17 00:00:00 2001
From: Matthew Barbour <matthew@darkholme.net>
Date: Fri, 14 Aug 2020 03:42:54 -0500
Subject: [PATCH 2/2] Added mantainer label

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 2f24b20..8179b63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
 FROM scratch
 
+LABEL maintainer="sanmadjack"
+
 # copy local files
 COPY root/ /