From af04b930644f80ba455b3f7265c34a40b72fbb2b Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Tue, 2 Aug 2016 09:09:48 +0800
Subject: [PATCH] update openwrt

---
 openwrt/Dockerfile         | 15 ---------------
 openwrt/Dockerfile.bcm2708 | 21 +++++++++++++++++++++
 openwrt/Dockerfile.bcm2710 | 21 +++++++++++++++++++++
 openwrt/Dockerfile.mt7628  | 31 ++-----------------------------
 openwrt/docker-compose.yml |  6 +++---
 5 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 openwrt/Dockerfile.bcm2708
 create mode 100644 openwrt/Dockerfile.bcm2710

diff --git a/openwrt/Dockerfile b/openwrt/Dockerfile
index 68accdc..09b0fa7 100644
--- a/openwrt/Dockerfile
+++ b/openwrt/Dockerfile
@@ -30,19 +30,4 @@ RUN set -xe \
 USER openwrt
 WORKDIR /home/openwrt
 
-ENV OPENWRT_VERSION=15.05.1
-ENV OPENWRT_URL=https://downloads.openwrt.org/chaos_calmer/15.05.1/brcm2708/bcm2708
-ENV OPENWRT_IMG=OpenWrt-ImageBuilder-15.05.1-brcm2708-bcm2708.Linux-x86_64
-ENV OPENWRT_SDK=OpenWrt-SDK-15.05.1-brcm2708-bcm2708_gcc-4.8-linaro_uClibc-0.9.33.2_eabi.Linux-x86_64
-ENV OPENWRT_IMG_URL=${OPENWRT_URL}/${OPENWRT_IMG}.tar.bz2
-ENV OPENWRT_SDK_URL=${OPENWRT_URL}/${OPENWRT_SDK}.tar.bz2
-
-RUN set -xe \
-    && curl -sSL ${OPENWRT_IMG_URL} | tar xj \
-    && curl -sSL ${OPENWRT_SDK_URL} | tar xj \
-    && ln -s ${OPENWRT_IMG} img \
-    && ln -s ${OPENWRT_SDK} sdk \
-    && cd sdk \
-    && ./scripts/feeds update -a
-
 CMD ["bash"]
diff --git a/openwrt/Dockerfile.bcm2708 b/openwrt/Dockerfile.bcm2708
new file mode 100644
index 0000000..0d21763
--- /dev/null
+++ b/openwrt/Dockerfile.bcm2708
@@ -0,0 +1,21 @@
+#
+# Dockerfile for openwrt:bcm2708
+#
+
+FROM vimagick/openwrt
+MAINTAINER kev <noreply@easypi.info>
+
+ENV OPENWRT_VERSION=15.05.1
+ENV OPENWRT_URL=https://downloads.openwrt.org/chaos_calmer/15.05.1/brcm2708/bcm2708
+ENV OPENWRT_IMG=OpenWrt-ImageBuilder-15.05.1-brcm2708-bcm2708.Linux-x86_64
+ENV OPENWRT_SDK=OpenWrt-SDK-15.05.1-brcm2708-bcm2708_gcc-4.8-linaro_uClibc-0.9.33.2_eabi.Linux-x86_64
+ENV OPENWRT_IMG_URL=${OPENWRT_URL}/${OPENWRT_IMG}.tar.bz2
+ENV OPENWRT_SDK_URL=${OPENWRT_URL}/${OPENWRT_SDK}.tar.bz2
+
+RUN set -xe \
+    && curl -sSL ${OPENWRT_IMG_URL} | tar xj \
+    && curl -sSL ${OPENWRT_SDK_URL} | tar xj \
+    && ln -s ${OPENWRT_IMG} img \
+    && ln -s ${OPENWRT_SDK} sdk \
+    && cd sdk \
+    && ./scripts/feeds update -a
diff --git a/openwrt/Dockerfile.bcm2710 b/openwrt/Dockerfile.bcm2710
new file mode 100644
index 0000000..fc6bb9c
--- /dev/null
+++ b/openwrt/Dockerfile.bcm2710
@@ -0,0 +1,21 @@
+#
+# Dockerfile for openwrt:bcm2710
+#
+
+FROM vimagick/openwrt
+MAINTAINER kev <noreply@easypi.info>
+
+ENV OPENWRT_VERSION=trunk
+ENV OPENWRT_URL=https://downloads.lede-project.org/snapshots/targets/brcm2708/bcm2710
+ENV OPENWRT_IMG=lede-imagebuilder-brcm2708-bcm2710.Linux-x86_64
+ENV OPENWRT_SDK=lede-sdk-brcm2708-bcm2710_gcc-5.4.0_musl-1.1.15_eabi.Linux-x86_64
+ENV OPENWRT_IMG_URL=${OPENWRT_URL}/${OPENWRT_IMG}.tar.bz2
+ENV OPENWRT_SDK_URL=${OPENWRT_URL}/${OPENWRT_SDK}.tar.bz2
+
+RUN set -xe \
+    && curl -sSL ${OPENWRT_IMG_URL} | tar xj \
+    && curl -sSL ${OPENWRT_SDK_URL} | tar xj \
+    && ln -s ${OPENWRT_IMG} img \
+    && ln -s ${OPENWRT_SDK} sdk \
+    && cd sdk \
+    && ./scripts/feeds update -a
diff --git a/openwrt/Dockerfile.mt7628 b/openwrt/Dockerfile.mt7628
index 061cfb9..ff4cb91 100644
--- a/openwrt/Dockerfile.mt7628
+++ b/openwrt/Dockerfile.mt7628
@@ -1,35 +1,10 @@
 #
-# Dockerfile for openwrt
+# Dockerfile for openwrt:mt7628
 #
 
-FROM debian:jessie
+FROM vimagick/openwrt
 MAINTAINER kev <noreply@easypi.info>
 
-RUN set -xe \
-    && apt-get update \
-    && apt-get install -y build-essential \
-                          curl \
-                          file \
-                          gawk \
-                          gettext \
-                          git \
-                          libncurses5-dev \
-                          libssl-dev \
-                          mercurial \
-                          python \
-                          subversion \
-                          sudo \
-                          tree \
-                          unzip \
-                          wget \
-                          xsltproc \
-                          zlib1g-dev \
-    && useradd -m openwrt \
-    && echo 'openwrt ALL=NOPASSWD: ALL' > /etc/sudoers.d/openwrt
-
-USER openwrt
-WORKDIR /home/openwrt
-
 ENV OPENWRT_VERSION=trunk
 ENV OPENWRT_URL=https://downloads.openwrt.org/snapshots/trunk/ramips/mt7628
 ENV OPENWRT_IMG=OpenWrt-ImageBuilder-ramips-mt7628.Linux-x86_64
@@ -44,5 +19,3 @@ RUN set -xe \
     && ln -s ${OPENWRT_SDK} sdk \
     && cd sdk \
     && ./scripts/feeds update -a
-
-CMD ["bash"]
diff --git a/openwrt/docker-compose.yml b/openwrt/docker-compose.yml
index b301c01..5505a19 100644
--- a/openwrt/docker-compose.yml
+++ b/openwrt/docker-compose.yml
@@ -1,7 +1,7 @@
 openwrt:
-  image: vimagick/openwrt
-  container_name: openwrt
+  image: vimagick/openwrt:bcm2710
+  container_name: openwrt_bcm2710
   command: sleep inf
   volumes:
-    - ./data:/data
+    - ./data/bcm2710:/data
   restart: unless-stopped