From e67a87bf3a8a96eaf83a961ce18c46deb4403c1b Mon Sep 17 00:00:00 2001 From: Ali Borhani Date: Fri, 5 Oct 2018 23:13:00 +0330 Subject: [PATCH] revert to 32bit version and disable fast-open by default --- client-plugin/Dockerfile | 6 +++--- client-standalone/Dockerfile | 4 ++-- server-plugin/Dockerfile | 6 +++--- server-standalone/Dockerfile | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client-plugin/Dockerfile b/client-plugin/Dockerfile index 3c1b25c..c3d9a4a 100644 --- a/client-plugin/Dockerfile +++ b/client-plugin/Dockerfile @@ -4,7 +4,7 @@ ARG GOQUIET_VER=1.2.1 ENV GQ_SERVER_NAME=www.bing.com ENV GQ_KEY=exampleconftest -ENV GQ_FAST_OPEN=true +ENV GQ_FAST_OPEN=false ENV GQ_BROWSER=chrome ENV GQ_TICKET_TIME_HINT=3600 @@ -15,7 +15,7 @@ ENV SS_LOCAL_PORT=1080 RUN \ apk add --no-cache wget \ - && wget -O /usr/local/bin/gq-client https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-client-linux-arm64-$GOQUIET_VER \ + && wget -O /usr/local/bin/gq-client https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-client-linux-386-$GOQUIET_VER \ && chmod +x /usr/local/bin/gq-client RUN \ @@ -31,4 +31,4 @@ RUN \ EXPOSE $SS_LOCAL_PORT -ENTRYPOINT ss-local -s $SS_SERVER_ADDRESS -p $SS_SERVER_PORT -b $SS_LOCAL_ADDRESS -l $SS_LOCAL_PORT -k $SS_PASSWORD -m $SS_METHOD -t $SS_TIMEOUT -u --fast-open --plugin /usr/local/bin/gq-client --plugin-opts "/etc/goquiet/gqclient.json" +ENTRYPOINT ss-local -s $SS_SERVER_ADDRESS -p $SS_SERVER_PORT -b $SS_LOCAL_ADDRESS -l $SS_LOCAL_PORT -k $SS_PASSWORD -m $SS_METHOD -t $SS_TIMEOUT -u --plugin /usr/local/bin/gq-client --plugin-opts "/etc/goquiet/gqclient.json" diff --git a/client-standalone/Dockerfile b/client-standalone/Dockerfile index 521cd21..5583d6e 100644 --- a/client-standalone/Dockerfile +++ b/client-standalone/Dockerfile @@ -4,7 +4,7 @@ ARG GOQUIET_VER=1.2.1 ENV GQ_SERVER_NAME=www.bing.com ENV GQ_KEY=exampleconftest -ENV GQ_FAST_OPEN=true +ENV GQ_FAST_OPEN=false ENV GQ_BROWSER=chrome ENV GQ_TICKET_TIME_HINT=3600 ENV GQ_LOCAL_PORT=1984 @@ -13,7 +13,7 @@ ENV GQ_SERVER_PORT=443 RUN \ apk add --no-cache wget \ - && wget -O /usr/local/bin/gq-client https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-client-linux-arm64-$GOQUIET_VER \ + && wget -O /usr/local/bin/gq-client https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-client-linux-386-$GOQUIET_VER \ && chmod +x /usr/local/bin/gq-client RUN \ diff --git a/server-plugin/Dockerfile b/server-plugin/Dockerfile index 040931a..905f156 100644 --- a/server-plugin/Dockerfile +++ b/server-plugin/Dockerfile @@ -4,11 +4,11 @@ ARG GOQUIET_VER=1.2.1 ENV GQ_WEBSERVER_ADDRESS=1.1.1.1:443 ENV GQ_KEY=exampleconftest -ENV GQ_FAST_OPEN=true +ENV GQ_FAST_OPEN=false RUN \ apk add --no-cache wget \ - && wget -O /usr/local/bin/gq-server https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-server-linux-amd64-$GOQUIET_VER \ + && wget -O /usr/local/bin/gq-server https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-server-linux-386-$GOQUIET_VER \ && chmod +x /usr/local/bin/gq-server RUN \ @@ -20,5 +20,5 @@ RUN \ }"\ > /etc/goquiet/gqserver.json -ENTRYPOINT ss-server -p $SS_PORT -k $SS_PASSWORD -m $SS_METHOD -t $SS_TIMEOUT -d 1.1.1.1 -d 8.8.8.8 -u --fast-open --plugin /usr/local/bin/gq-server --plugin-opts "/etc/goquiet/gqserver.json" +ENTRYPOINT ss-server -p $SS_PORT -k $SS_PASSWORD -m $SS_METHOD -t $SS_TIMEOUT -d 1.1.1.1 -d 8.8.8.8 -u --plugin /usr/local/bin/gq-server --plugin-opts "/etc/goquiet/gqserver.json" diff --git a/server-standalone/Dockerfile b/server-standalone/Dockerfile index 78fd6c4..df2df32 100644 --- a/server-standalone/Dockerfile +++ b/server-standalone/Dockerfile @@ -4,7 +4,7 @@ ARG GOQUIET_VER=1.2.1 ENV GQ_WEBSERVER_ADDRESS=1.1.1.1:443 ENV GQ_KEY=exampleconftest -ENV GQ_FAST_OPEN=true +ENV GQ_FAST_OPEN=false ENV GQ_SS_HOST=127.0.0.1 ENV GQ_SS_PORT=8388 @@ -13,7 +13,7 @@ ENV GQ_PORT=443 RUN \ apk add --no-cache wget \ - && wget -O /usr/local/bin/gq-server https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-server-linux-amd64-$GOQUIET_VER \ + && wget -O /usr/local/bin/gq-server https://github.com/cbeuw/GoQuiet/releases/download/v$GOQUIET_VER/gq-server-linux-386-$GOQUIET_VER \ && chmod +x /usr/local/bin/gq-server RUN \ @@ -27,4 +27,4 @@ RUN \ EXPOSE $GQ_PORT/tcp $GQ_PORT/udp -ENTRYPOINT gq-server -s $GQ_HOST -p $GQ_PORT -r "$GQ_SS_HOST:$GQ_SS_PORT" -c /etc/goquiet/gqserver.json \ No newline at end of file +ENTRYPOINT /usr/local/bin/gq-server -s $GQ_HOST -p $GQ_PORT -r "$GQ_SS_HOST:$GQ_SS_PORT" -c /etc/goquiet/gqserver.json \ No newline at end of file