From 54f70c5dbec4221149819563ef2fbeb7c954f0f7 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Thu, 7 Jul 2016 17:30:08 +0800
Subject: [PATCH] update red5-arm

---
 README.md                  | 22 +++++++++++-----------
 red5/Dockerfile            |  2 +-
 red5/arm/Dockerfile        | 14 ++++++++++----
 red5/arm/Dockerfile.alpine | 24 ++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 red5/arm/Dockerfile.alpine

diff --git a/README.md b/README.md
index 25da0b2..e5b42f1 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,6 @@ A collection of delicious docker recipes.
 - [ ] tshark
 - [ ] youtube-upload
 - [ ] xl2tpd
-- [ ] zoneminder
 
 ## Daemon
 
@@ -53,16 +52,13 @@ A collection of delicious docker recipes.
 - [x] cadvisor
 - [x] casperjs :+1:
 - [x] collectd
-- [x] ffserver :beetle:
 - [x] h2o
 - [x] httpbin :+1:
 - [x] hubot
 - [x] influxdb
 - [x] influxdb-arm
-- [x] live555
 - [x] mariadb
 - [x] mariadb-arm
-- [x] minidlna
 - [x] monit
 - [x] moodle :beetle:
 - [x] mosquitto
@@ -73,15 +69,10 @@ A collection of delicious docker recipes.
 - [x] nullmailer-arm
 - [x] openssh
 - [x] phantomjs
-- [x] plex :moneybag:
 - [x] portia
 - [x] pure-ftpd
-- [x] red5 :+1:
-- [x] red5-arm
 - [x] redis-arm
 - [x] rsyncd
-- [x] rtmp-client
-- [x] rtmp-server
 - [x] samba :+1:
 - [x] samba-arm :+1:
 - [x] scrapyd :+1:
@@ -95,12 +86,20 @@ A collection of delicious docker recipes.
 - [x] vsftpd
 - [x] webhook
 - [x] webkit :beetle:
-- [x] youtube-worker :beetle:
 
-## Tool
+## Media
 
 - [x] ffmpeg
+- [x] ffserver :beetle:
+- [x] live555
+- [x] minidlna
+- [x] plex :moneybag:
+- [x] red5 :+1:
+- [x] red5-arm :construction:
+- [x] rtmp-client
+- [x] rtmp-server
 - [x] youtube-dl
+- [x] youtube-worker :beetle:
 
 ## Web
 
@@ -131,6 +130,7 @@ A collection of delicious docker recipes.
 - [x] phpvirtualbox-arm
 - [x] piwik
 - [x] revive
+- [x] zoneminder
 
 ## Security
 
diff --git a/red5/Dockerfile b/red5/Dockerfile
index da149f4..bdf9e3a 100644
--- a/red5/Dockerfile
+++ b/red5/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for red5
 #
 
-FROM java:8-alpine
+FROM java:8-jre-alpine
 MAINTAINER kev <noreply@easypi.info>
 
 ENV RED5_VERSION 1.0.7
diff --git a/red5/arm/Dockerfile b/red5/arm/Dockerfile
index f35ad1b..3c73ba4 100644
--- a/red5/arm/Dockerfile
+++ b/red5/arm/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for red5-arm
 #
 
-FROM easypi/alpine-arm
+FROM armhf/debian:jessie
 MAINTAINER EasyPi Software Foundation
 
 ENV RED5_VERSION 1.0.7
@@ -12,11 +12,17 @@ ENV RED5_URL https://github.com/Red5/red5-server/releases/download/v${RED5_VERSI
 WORKDIR /opt/red5
 
 RUN set -xe \
-    && apk add --no-cache --progress bash curl openjdk7-jre tar \
+    && echo 'deb http://httpredir.debian.org/debian jessie-backports main' >> /etc/apt/sources.list \
+    && apt-get update \
+    && apt-get install -y ca-certificates-java \
+                          curl \
+                          openjdk-8-jre-headless \
+    && /var/lib/dpkg/info/ca-certificates-java.postinst configure \
     && curl -sSL ${RED5_URL} | tar xz --strip 1 \
-    && apk del curl tar
+    && apt-get remove -y curl \
+    && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk/jre
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-armhf/jre
 ENV PATH $PATH:$JAVA_HOME/bin
 
 EXPOSE 843 1935 5080 5443 8081 8443
diff --git a/red5/arm/Dockerfile.alpine b/red5/arm/Dockerfile.alpine
new file mode 100644
index 0000000..c5b5c0b
--- /dev/null
+++ b/red5/arm/Dockerfile.alpine
@@ -0,0 +1,24 @@
+#
+# Dockerfile for red5-arm
+#
+
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
+
+ENV RED5_VERSION 1.0.7
+ENV RED5_FILE red5-server-${RED5_VERSION}-RELEASE.tar.gz
+ENV RED5_URL https://github.com/Red5/red5-server/releases/download/v${RED5_VERSION}-RELEASE/${RED5_FILE}
+
+WORKDIR /opt/red5
+
+RUN set -xe \
+    && apk add --no-cache --progress bash curl openjdk8-jre tar \
+    && curl -sSL ${RED5_URL} | tar xz --strip 1 \
+    && apk del curl tar
+
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
+ENV PATH $PATH:$JAVA_HOME/bin
+
+EXPOSE 843 1935 5080 5443 8081 8443
+
+ENTRYPOINT ["./red5.sh"]