From 6a79f3ba30ee9f74e754ef1443f8815781ad9511 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Tue, 2 Jan 2018 23:28:05 +0800
Subject: [PATCH] update red5-arm

---
 red5/arm/Dockerfile        | 14 ++++----------
 red5/arm/Dockerfile.alpine | 24 ------------------------
 red5/arm/Dockerfile.debian | 30 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 red5/arm/Dockerfile.alpine
 create mode 100644 red5/arm/Dockerfile.debian

diff --git a/red5/arm/Dockerfile b/red5/arm/Dockerfile
index a59e5d2..020dc96 100644
--- a/red5/arm/Dockerfile
+++ b/red5/arm/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for red5-arm
 #
 
-FROM armhf/debian:jessie
+FROM easypi/alpine-arm
 MAINTAINER EasyPi Software Foundation
 
 ENV RED5_VERSION 1.0.9
@@ -12,17 +12,11 @@ ENV RED5_URL https://github.com/Red5/red5-server/releases/download/v${RED5_VERSI
 WORKDIR /opt/red5
 
 RUN set -xe \
-    && 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 \
+    && apk add --no-cache --progress bash curl openjdk8-jre tar \
     && curl -sSL ${RED5_URL} | tar xz --strip 1 \
-    && apt-get remove -y curl \
-    && rm -rf /var/lib/apt/lists/*
+    && apk del curl tar
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-armhf/jre
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/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
deleted file mode 100644
index 020dc96..0000000
--- a/red5/arm/Dockerfile.alpine
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Dockerfile for red5-arm
-#
-
-FROM easypi/alpine-arm
-MAINTAINER EasyPi Software Foundation
-
-ENV RED5_VERSION 1.0.9
-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"]
diff --git a/red5/arm/Dockerfile.debian b/red5/arm/Dockerfile.debian
new file mode 100644
index 0000000..a59e5d2
--- /dev/null
+++ b/red5/arm/Dockerfile.debian
@@ -0,0 +1,30 @@
+#
+# Dockerfile for red5-arm
+#
+
+FROM armhf/debian:jessie
+MAINTAINER EasyPi Software Foundation
+
+ENV RED5_VERSION 1.0.9
+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 \
+    && 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 \
+    && apt-get remove -y curl \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-armhf/jre
+ENV PATH $PATH:$JAVA_HOME/bin
+
+EXPOSE 843 1935 5080 5443 8081 8443
+
+ENTRYPOINT ["./red5.sh"]