From d846e0ea290b99c153e49513997f69d82880ed73 Mon Sep 17 00:00:00 2001
From: Jean Froment <jean.froment@apalia.net>
Date: Mon, 27 Mar 2017 16:36:37 +0200
Subject: [PATCH] Merge plex webtools into plex

---
 Dockerfiles/plex-webtools/Dockerfile | 20 --------------------
 Dockerfiles/plex/Dockerfile          |  4 +++-
 Dockerfiles/plex/init                | 12 +++++++++++-
 3 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 Dockerfiles/plex-webtools/Dockerfile

diff --git a/Dockerfiles/plex-webtools/Dockerfile b/Dockerfiles/plex-webtools/Dockerfile
deleted file mode 100644
index 1770cb7..0000000
--- a/Dockerfiles/plex-webtools/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM buildpack-deps:xenial-scm
-MAINTAINER Jean Froment <froment.je@gmail.com>
-
-RUN apt-get update \
-	&& apt-get install -y unzip libcurl4-openssl-dev \
-	&& wt_tag=$(curl -sX GET "https://api.github.com/repos/ukdtom/WebTools.bundle/releases/latest" \
-    	| awk '/tag_name/{print $4;exit}' FS='[""]') \
-	&& wget "https://github.com/ukdtom/WebTools.bundle/releases/download/$wt_tag/WebTools.bundle.zip" \
-    	-O /opt/WebTools.bundle.zip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-VOLUME /config
-
-RUN mkdir -p "/config/Plex Media Server/" \
-	&& cp /opt/WebTools.bundle.zip /config/Plex\ Media\ Server/ \
-	&& unzip /config/Plex\ Media\ Server/WebTools.bundle.zip \
-	&& rm -f /opt/WebTools.bundle.zip /config/Plex\ Media\ Server/WebTools.bundle.zip
-
-EXPOSE 33443
diff --git a/Dockerfiles/plex/Dockerfile b/Dockerfiles/plex/Dockerfile
index 53b4c95..0b407c8 100644
--- a/Dockerfiles/plex/Dockerfile
+++ b/Dockerfiles/plex/Dockerfile
@@ -7,12 +7,14 @@ RUN curl -sL "https://raw.githubusercontent.com/Kelvin-Chen/plexupdate/master/pl
         > /usr/local/bin/plexupdate \
     && chmod +x /usr/local/bin/plexupdate \
     && plexupdate -pad \
+    && apt-get install -y unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 VOLUME /config
 
-EXPOSE 32400
+# 32400 for Plex server, 33443 for Plex WebTools secure access
+EXPOSE 32400 33443
 
 COPY plexmediaserver /etc/default/plexmediaserver
 COPY init Preferences.xml /
diff --git a/Dockerfiles/plex/init b/Dockerfiles/plex/init
index 36135fe..8d6f505 100755
--- a/Dockerfiles/plex/init
+++ b/Dockerfiles/plex/init
@@ -9,4 +9,14 @@ mkdir -p "/config/Plex Media Server/"
 cp -n /Preferences.xml "/config/Plex Media Server/"
 rm -f "/config/Plex Media Server/plexmediaserver.pid"
 
-exec start_pms > /dev/null 2>&1
+# Plex WebTools
+if [ ! -d "/config/Plex Media Server/Plug-ins/WebTools.bundle" ]; then
+	wt_tag = $(curl -sX GET "https://api.github.com/repos/ukdtom/WebTools.bundle/releases/latest" \
+    	| awk '/tag_name/{print $4;exit}' FS='[""]')
+	wget "https://github.com/ukdtom/WebTools.bundle/releases/download/$wt_tag/WebTools.bundle.zip" \
+    	-O /config/Plex\ Media\ Server/Plug-ins/WebTools.bundle.zip
+  	unzip /config/Plex\ Media\ Server/Plug-ins/WebTools.bundle.zip
+  	rm /config/Plex\ Media\ Server/Plug-ins/WebTools.bundle.zip
+fi
+
+exec start_pms > /dev/null 2>&1
\ No newline at end of file