more efficient no_proxy; cleanup

Author: boriska70

docker-compose-voteapp.yml

@@ -35,27 +35,5 @@ services:
         aliases:
           - workers
 
-  redis:
-    image: redis:3.2-alpine
-    ports:
-      - "6379"
-    networks:
-      - voteapp
-    container_name: redis
-
-  db:
-    image: postgres:9.4
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    networks:
-      - voteapp
-    container_name: db
-
-volumes:
-  db-data:
-    # driver: rexray
-    # driver_opts:
-    #  size: 10
-
 networks:
     voteapp:

set_network.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
 subnet=$(docker network inspect --format='{{(index (index .IPAM.Config) 0).Subnet}}' examplevotingapp_voteapp)
+
 [ $http_proxy ] && tb_proxy=$http_proxy || tb_proxy=$HTTP_PROXY
-[ $no_proxy ] && tb_no_proxy=$no_proxy,result,es,$(seq -s ',' -f $(echo $subnet | cut -d '.' -f1-3).%g 0 255) || tb_no_proxy=$(seq -s ',' -f $(echo $subnet | cut -d '.' -f1-3).%g 0 255)
+tb_no_proxy=$(echo redis,db,voting-app,result,es),$(seq -s ',' -f $(echo $subnet | cut -d '.' -f1-3).%g 0 255)
+[ $no_proxy ] && tb_no_proxy=$tb_no_proxy,$no_proxy,127.0.0.1,localhost || tb_no_proxy=$tb_no_proxy,$NO_PROXY,127.0.0.1,localhost
 
 # echo tb_proxy=$tb_proxy
 # echo tb_no_proxy=$tb_no_proxy