Merge branch '0.2.1'

CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.2.1
+
+### Fix
+
+- 只要是`bridge`的网路都有可能是容器的`bridge`网络, 这次修改后`docker-compose`创建的容器 IP 也能获取到了

cmd/dcip/dcip.go

@@ -32,7 +32,7 @@ func reportError(err error) {
 
 func main() {
 	ctx := kong.Parse(&CLI,
-		kong.Vars{"version": "0.2.0"},
+		kong.Vars{"version": "0.2.1"},
 	)
 	switch ctx.Command() {
 	case "of <[host|name]>":

ip.go

@@ -2,7 +2,7 @@ package dcip
 
 import "fmt"
 
-var getNetworks = "docker network ls --format='{{.Name}}' | grep -E 'bridge|docker_gwbridge'"
+var getNetworks = "docker network ls  --filter=driver=bridge --format='{{.Name}}'"
 var getAllConatinersIP = fmt.Sprintf("for dn in $(%s);do docker network inspect $dn --format '{{range $k,$c:=.Containers}}{{$k}}/{{.IPv4Address}}{{println}}{{end}}';done", getNetworks)
 var getContainerID = "docker ps --latest -q --no-trunc --filter='name=%s'"
 var getIPOnly = "awk -F '/' '{print $2}'"