4646 IMAGE=' shadowsocks-rust:stable'
4747fi
4848
49+ if [[ " $http_proxy " != " " ]]; then
50+ ENV_HTTP_PROXY=$http_proxy
51+ elif [[ " $HTTP_PROXY " != " " ]]; then
52+ ENV_HTTP_PROXY=$HTTP_PROXY
53+ fi
54+
55+ if [[ " $https_proxy " != " " ]]; then
56+ ENV_HTTPS_PROXY=$https_proxy
57+ elif [[ " $HTTPS_PROXY " != " " ]]; then
58+ ENV_HTTPS_PROXY=$HTTPS_PROXY
59+ fi
60+
4961if $BUILD_DOCKER_IMG ; then
5062 echo " * Rebuild docker image ${IMAGE} ..." ;
5163 if $BUILD_NIGHTLY ; then
52- docker build -t " ${IMAGE} " " $CUR_DIR " --build-arg TOOLCHAIN=nightly;
64+ docker build \
65+ -t " ${IMAGE} " \
66+ " $CUR_DIR " \
67+ --build-arg TOOLCHAIN=nightly \
68+ --build-arg HTTP_PROXY=" $ENV_HTTP_PROXY " \
69+ --build-arg HTTPS_PROXY=" $ENV_HTTPS_PROXY " ;
5370 else
54- docker build -t " ${IMAGE} " " $CUR_DIR " --build-arg TOOLCHAIN=stable;
71+ docker build \
72+ -t " ${IMAGE} " \
73+ " $CUR_DIR " \
74+ --build-arg TOOLCHAIN=stable \
75+ --build-arg HTTP_PROXY=" $ENV_HTTP_PROXY " \
76+ --build-arg HTTPS_PROXY=" $ENV_HTTPS_PROXY " ;
5577 fi
5678fi
5779
@@ -68,8 +90,8 @@ if $BUILD_NIGHTLY; then
6890 -e CARGO_TARGET_DIR=" ${CARGO_TARGET_DIR} " \
6991 -e CARGO_INSTALL_ROOT=" ${CARGO_INSTALL_ROOT} " \
7092 -e RUSTFLAGS=" -Ctarget-feature=+aes" \
71- -e HTTP_PROXY=" $HTTP_PROXY " \
72- -e HTTPS_PROXY=" $HTTPS_PROXY " \
93+ -e HTTP_PROXY=" $ENV_HTTP_PROXY " \
94+ -e HTTPS_PROXY=" $ENV_HTTPS_PROXY " \
7395 -v " ${CUR_DIR} " /..:" $SRC_PATH " \
7496 -v " ${CUR_DIR} /target/musl-builder/cargo-cache" :/home/rust/.cargo/registry \
7597 " ${IMAGE} " \
82104 docker run \
83105 -e CARGO_TARGET_DIR=" ${CARGO_TARGET_DIR} " \
84106 -e CARGO_INSTALL_ROOT=" ${CARGO_INSTALL_ROOT} " \
85- -e HTTP_PROXY=" $HTTP_PROXY " \
86- -e HTTPS_PROXY=" $HTTPS_PROXY " \
107+ -e HTTP_PROXY=" $ENV_HTTP_PROXY " \
108+ -e HTTPS_PROXY=" $ENV_HTTPS_PROXY " \
87109 -v " ${CUR_DIR} " /..:" $SRC_PATH " \
88110 -v " ${CUR_DIR} /target/musl-builder/cargo-cache" :/home/rust/.cargo/registry \
89111 " ${IMAGE} " \
0 commit comments