tidy up

Author: vimagick

.travis.yml

@@ -6,7 +6,6 @@ services:
 env:
   global:
     - SS_VER=3.3.3
-    - SS_DEB=shadowsocks-libev_${SS_VER}-1_amd64.deb
   matrix:
     - URL=https://www.facebook.com/
     - URL=https://www.google.com/
@@ -15,8 +14,8 @@ env:
 
 before_install:
   - docker run --rm --privileged multiarch/qemu-user-static:register --reset
-  - docker build -t easypi/shadowsocks-libev-arm:$SS_VER -f Dockerfile.arm .
-  - docker build -t easypi/shadowsocks-libev:$SS_VER .
+  - docker build -t easypi/shadowsocks-libev-arm:$SS_VER -f Dockerfile.arm --build-arg SS_VER=$SS_VER .
+  - docker build -t easypi/shadowsocks-libev:$SS_VER --build-arg SS_VER=$SS_VER .
   - docker run -d -p 127.0.0.1:8388:8388 -e PASSWORD=helloworld --name server easypi/shadowsocks-libev:$SS_VER
   - docker run -d -p 127.0.0.1:1080:1080 --link server:server --name client easypi/shadowsocks-libev:$SS_VER
     ss-local -s server -p 8388 -m aes-256-cfb -k helloworld -b 0.0.0.0 -l 1080 -t 60 --fast-open

Dockerfile

@@ -5,7 +5,7 @@
 FROM alpine:3.10
 MAINTAINER EasyPi Software Foundation
 
-ENV SS_VER 3.3.3
+ARG SS_VER
 ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz
 ENV SS_DIR shadowsocks-libev-$SS_VER
 

Dockerfile.arm

@@ -2,10 +2,10 @@
 # Dockerfile for shadowsocks-libev-arm
 #
 
-FROM easypi/alpine-arm:build
+FROM multiarch/alpine:armhf-v3.10
 MAINTAINER EasyPi Software Foundation
 
-ENV SS_VER 3.3.3
+ARG SS_VER
 ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz
 ENV SS_DIR shadowsocks-libev-$SS_VER