diff --git a/docker.sh b/docker.sh index 3180446f..de07cb2b 100755 --- a/docker.sh +++ b/docker.sh @@ -23,24 +23,5 @@ export GIT_COMMIT_GEARPUMP=$(git -C oisp-gearpump-rule-engine rev-parse HEAD) export GIT_COMMIT_WEBSOCKET_SERVER=$(git -C oisp-websocket-server rev-parse HEAD) export GIT_COMMIT_BACKEND=$(git -C oisp-backend rev-parse HEAD) -redsocks_container_name='redsocks' -if [ -n "$http_proxy" ] && [ -n "$https_proxy" ] && [ "$1" == "up" ]; then - # Run redsocks to allow containers to use proxy - - - if ! [[ $(docker ps -f "name=$redsocks_container_name" --format '{{.Names}}') == $redsocks_container_name ]]; then - echo "Starting redsocks..." - - docker run -d --net=host --privileged --name $redsocks_container_name --rm -e http_proxy=$http_proxy -e https_proxy=$https_proxy klabs/forgetproxy - echo - fi -fi - -docker-compose $* - -if [ "$1" == "stop" ]; then - if [[ $(docker ps -f "name=$redsocks_container_name" --format '{{.Names}}') == $redsocks_container_name ]]; then - docker stop $redsocks_container_name - fi -fi +docker-compose $* || exit 1