From a2c0303fb33d2e3e65270831fa2e966e6ec7ddaf Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Tue, 2 Aug 2016 10:23:13 +0800
Subject: [PATCH] update openwrt for shadowsocks guide

---
 openwrt/Dockerfile |  1 +
 openwrt/README.md  | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/openwrt/Dockerfile b/openwrt/Dockerfile
index 09b0fa7..e3faee5 100644
--- a/openwrt/Dockerfile
+++ b/openwrt/Dockerfile
@@ -22,6 +22,7 @@ RUN set -xe \
                           tree \
                           unzip \
                           wget \
+                          vim-tiny \
                           xsltproc \
                           zlib1g-dev \
     && useradd -m openwrt \
diff --git a/openwrt/README.md b/openwrt/README.md
index ef9bbe3..d8d897d 100644
--- a/openwrt/README.md
+++ b/openwrt/README.md
@@ -7,20 +7,21 @@ Build OpenWrt Package/Image For Raspberry Pi
 
 ```yaml
 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
 ```
 
 ## up and running
 
 ```bash
-$ mkdir -m 777 data
 $ docker-compose up -d
 $ docker-compose exec openwrt bash
 >>> cd ~/sdk
+>>> sudo chmod 777 /data
 >>> ln -s /data bin
 
 >>> ./scripts/feeds update -a
@@ -30,16 +31,19 @@ $ docker-compose exec openwrt bash
 >>> make V=s
 
 >>> export TERM=xterm
->>> sudo apt install asciidoc xmlto
->>> ./scripts/feeds install libopenssl zlib
+>>> sudo apt install -y asciidoc xmlto
 >>> git clone https://github.com/shadowsocks/openwrt-shadowsocks.git package/shadowsocks-libev
->>> make menuconfig
+>>> vi package/shadowsocks-libev/Makefile
+- Package/shadowsocks-libev-spec = $(call Package/shadowsocks-libev/Default,openssl,(OpenSSL),+libopenssl +libpthread +ipset +ip)
++ Package/shadowsocks-libev-spec = $(call Package/shadowsocks-libev/Default,openssl,(OpenSSL),+libopenssl +libpthread +ipset +ip +iptables-mod-tproxy +zlib)
+>>> make menuconfig # Network ▷ shadowsocks-libev-spec ▷ Save ▷ Exit
+>>> make package/zlib/compile V=s
 >>> make package/shadowsocks-libev/compile V=s
 
 >>> tree -dF /data/
 /data/
-└── brcm2708
-    └── packages
+└── brcm2708/
+    └── packages/
         ├── base
         ├── luci
         ├── management