Skip to content

Commit c696934

Browse files
committed
Bump version
1 parent f008e5f commit c696934

File tree

7 files changed

+20
-24
lines changed

7 files changed

+20
-24
lines changed

.travis.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99

1010
env:
1111
global:
12-
- SS_VER=2.6.3
12+
- SS_VER=3.0.0
1313
- SS_DEB=shadowsocks-libev_${SS_VER}-1_amd64.deb
1414
matrix:
1515
- URL=https://www.facebook.com/
@@ -21,13 +21,13 @@ before_install:
2121
- docker build -t easypi/shadowsocks-libev:$SS_VER .
2222
- docker run -d -p 127.0.0.1:8388:8388 -e PASSWORD=helloworld --name server easypi/shadowsocks-libev:$SS_VER
2323
- docker run -d -p 127.0.0.1:1080:1080 --link server:server --name client easypi/shadowsocks-libev:$SS_VER
24-
ss-local -s server -p 8388 -m aes-256-cfb -k helloworld -b 0.0.0.0 -l 1080 -t 60 -A --fast-open
24+
ss-local -s server -p 8388 -m aes-256-cfb -k helloworld -b 0.0.0.0 -l 1080 -t 60 --fast-open
2525
- docker ps -a
2626

27-
#before_script:
28-
# - docker build -t easypi/shadowsocks-libev:debian -f Dockerfile.debian .
29-
# - docker run --rm -v $PWD:/data --entrypoint cp easypi/shadowsocks-libev:debian $SS_DEB /data
30-
# - sudo chmod 666 $SS_DEB
27+
before_script:
28+
- docker build -t easypi/shadowsocks-libev:debian -f Dockerfile.debian .
29+
- docker run --rm -v $PWD:/data --entrypoint cp easypi/shadowsocks-libev:debian $SS_DEB /data
30+
- sudo chmod 666 $SS_DEB
3131

3232
script:
3333
- curl -I -x socks5h://127.0.0.1:1080 $URL
@@ -41,12 +41,12 @@ after_success:
4141
docker push easypi/shadowsocks-libev:latest;
4242
fi
4343

44-
#deploy:
45-
# provider: releases
46-
# api_key:
47-
# secure: "W3zCVwHoUbwH7xR4jIPhv/sCnxvAH9Ta6ZtLHSN8tNss6vifbP4uIMc+wPhyN3KPeCV7BpvE95n/zfWvwfd+BrSwNPtP2yu/jCFEu0c1LBWBVZw02RK7osTeLfUvDmSLp/47aOPkoxppXziVjXGSgmtioD+HEizfTQPd5QOVsY2fnXcYiFmC5meI9AcNx6nIPPS307dEuSZOfjVCecl6SFiTo242/XAV1Ix5dGzAKC2B76Wqa+rnfWf6q0ScbmeBRFHusEScs1lF0dIbp7FjDgRjMxHVc4cPGzT2WK+GaYdQyIeXbJ2AQfXWXLKWoXU8Hq07gDK2DjAp/thqXFMduPfAeaoWb/9sVpWKxdJJokJ8b3BWd9PkP5VKWkpeYM2HpQ70+N9Om7ntHEZVkweHbyyykkNUT7mNLF3XjRdvdYm6H7GnROHQKSniQY8pAeorHYc8AW6N6iY7E3HBzD388rOGTDYDbq8HbOEFMGEM9KGLw89rn6+h6znbixi93vuVS+brsu08BRtBUCXMJ3fRDcS1PoHVGIyMPVJLhTe3+E257s9Xfa/8xq5zS/yvlxofe7zovF8AdvcnevkR0X/ibmGqfCe9h0IXSdeM7DyzwkzPKA+6SVKTbyYeb5NyTNoEKnwnWYPz4HGj+WrpysUrTvrw5PejHLdgPy7e8/n+Ke8="
48-
# file: $SS_DEB
49-
# skip_cleanup: true
50-
# on:
51-
# tags: true
52-
# condition: $URL == *youtube*
44+
deploy:
45+
provider: releases
46+
api_key:
47+
secure: "W3zCVwHoUbwH7xR4jIPhv/sCnxvAH9Ta6ZtLHSN8tNss6vifbP4uIMc+wPhyN3KPeCV7BpvE95n/zfWvwfd+BrSwNPtP2yu/jCFEu0c1LBWBVZw02RK7osTeLfUvDmSLp/47aOPkoxppXziVjXGSgmtioD+HEizfTQPd5QOVsY2fnXcYiFmC5meI9AcNx6nIPPS307dEuSZOfjVCecl6SFiTo242/XAV1Ix5dGzAKC2B76Wqa+rnfWf6q0ScbmeBRFHusEScs1lF0dIbp7FjDgRjMxHVc4cPGzT2WK+GaYdQyIeXbJ2AQfXWXLKWoXU8Hq07gDK2DjAp/thqXFMduPfAeaoWb/9sVpWKxdJJokJ8b3BWd9PkP5VKWkpeYM2HpQ70+N9Om7ntHEZVkweHbyyykkNUT7mNLF3XjRdvdYm6H7GnROHQKSniQY8pAeorHYc8AW6N6iY7E3HBzD388rOGTDYDbq8HbOEFMGEM9KGLw89rn6+h6znbixi93vuVS+brsu08BRtBUCXMJ3fRDcS1PoHVGIyMPVJLhTe3+E257s9Xfa/8xq5zS/yvlxofe7zovF8AdvcnevkR0X/ibmGqfCe9h0IXSdeM7DyzwkzPKA+6SVKTbyYeb5NyTNoEKnwnWYPz4HGj+WrpysUrTvrw5PejHLdgPy7e8/n+Ke8="
48+
file: $SS_DEB
49+
skip_cleanup: true
50+
on:
51+
tags: true
52+
condition: $URL == *youtube*

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM alpine
66
MAINTAINER EasyPi Software Foundation
77

8-
ENV SS_VER 2.6.3
8+
ENV SS_VER 3.0.0
99
ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz
1010
ENV SS_DIR shadowsocks-libev-$SS_VER
1111

@@ -57,5 +57,4 @@ CMD ss-server -s "$SERVER_ADDR" \
5757
-t "$TIMEOUT" \
5858
-d "$DNS_ADDR" \
5959
-u \
60-
-A \
6160
--fast-open $OPTIONS

Dockerfile.arm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM easypi/alpine-arm
66
MAINTAINER EasyPi Software Foundation
77

8-
ENV SS_VER 2.6.3
8+
ENV SS_VER 3.0.0
99
ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz
1010
ENV SS_DIR shadowsocks-libev-$SS_VER
1111

@@ -57,5 +57,4 @@ CMD ss-local -s "$SERVER_ADDR" \
5757
-b "$LOCAL_ADDR" \
5858
-l "$LOCAL_PORT" \
5959
-t "$TIMEOUT" \
60-
-A \
6160
--fast-open $OPTIONS

Dockerfile.debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM debian:jessie
66
MAINTAINER EasyPi Software Foundation
77

8-
ENV SS_VER 2.6.3
8+
ENV SS_VER 3.0.0
99
ENV SS_DIR shadowsocks-libev-${SS_VER}
1010
ENV SS_DEB shadowsocks-libev_${SS_VER}-1_amd64.deb
1111
ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev/archive/v${SS_VER}.tar.gz

Dockerfile.debian.arm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM resin/rpi-raspbian
66
MAINTAINER EasyPi Software Foundation
77

8-
ENV SS_VER 2.6.3
8+
ENV SS_VER 3.0.0
99
ENV SS_DIR shadowsocks-libev-${SS_VER}
1010
ENV SS_DEB shadowsocks-libev_${SS_VER}-1_armhf.deb
1111
ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev/archive/v${SS_VER}.tar.gz

config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
"local_port": 1080,
55
"password": "5ouMnqPyzseL",
66
"timeout": 60,
7-
"method": "aes-256-cfb",
8-
"auth": true
7+
"method": "aes-256-cfb"
98
}

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ client:
1818
-b 0.0.0.0
1919
-l 1080
2020
-t 60
21-
-A
2221
--fast-open
2322
ports:
2423
- "1080:1080"

0 commit comments

Comments
 (0)