GitList

@@ -940,12 +940,15 @@ type defBrOptsV4 struct {
 func (o defBrOptsV4) nlFamily() int {
 	return netlink.FAMILY_V4
 }
+
 func (o defBrOptsV4) fixedCIDR() (fCIDR, optName string) {
 	return o.cfg.FixedCIDR, "fixed-cidr"
 }
+
 func (o defBrOptsV4) bip() (bip, optName string) {
 	return o.cfg.IP, "bip"
 }
+
 func (o defBrOptsV4) defGw() (gw net.IP, optName, auxAddrLabel string) {
 	return o.cfg.DefaultGatewayIPv4, "default-gateway", "DefaultGatewayIPv4"
 }
@@ -957,12 +960,15 @@ type defBrOptsV6 struct {
 func (o defBrOptsV6) nlFamily() int {
 	return netlink.FAMILY_V6
 }
+
 func (o defBrOptsV6) fixedCIDR() (fCIDR, optName string) {
 	return o.cfg.FixedCIDRv6, "fixed-cidr-v6"
 }
+
 func (o defBrOptsV6) bip() (bip, optName string) {
 	return o.cfg.IP6, "bip6"
 }
+
 func (o defBrOptsV6) defGw() (gw net.IP, optName, auxAddrLabel string) {
 	return o.cfg.DefaultGatewayIPv6, "default-gateway-v6", "DefaultGatewayIPv6"
 }

daemon/hosts.go

History View file @ da5e86a

@@ -112,7 +112,6 @@ func mirrorsToRegistryHosts(mirrors []string, dHost docker.RegistryHost) []docke
 		mirrorHosts = append(mirrorHosts, h)
 	}
 	return append(mirrorHosts, dHost)
-
 }
 
 func loadTLSConfig(d string) (*tls.Config, error) {

...	...	@@ -940,12 +940,15 @@ type defBrOptsV4 struct {
940	940	func (o defBrOptsV4) nlFamily() int {
941	941	return netlink.FAMILY_V4
942	942	}
	943	+
943	944	func (o defBrOptsV4) fixedCIDR() (fCIDR, optName string) {
944	945	return o.cfg.FixedCIDR, "fixed-cidr"
945	946	}
	947	+
946	948	func (o defBrOptsV4) bip() (bip, optName string) {
947	949	return o.cfg.IP, "bip"
948	950	}
	951	+
949	952	func (o defBrOptsV4) defGw() (gw net.IP, optName, auxAddrLabel string) {
950	953	return o.cfg.DefaultGatewayIPv4, "default-gateway", "DefaultGatewayIPv4"
951	954	}
...	...	@@ -957,12 +960,15 @@ type defBrOptsV6 struct {
957	957	func (o defBrOptsV6) nlFamily() int {
958	958	return netlink.FAMILY_V6
959	959	}
	960	+
960	961	func (o defBrOptsV6) fixedCIDR() (fCIDR, optName string) {
961	962	return o.cfg.FixedCIDRv6, "fixed-cidr-v6"
962	963	}
	964	+
963	965	func (o defBrOptsV6) bip() (bip, optName string) {
964	966	return o.cfg.IP6, "bip6"
965	967	}
	968	+
966	969	func (o defBrOptsV6) defGw() (gw net.IP, optName, auxAddrLabel string) {
967	970	return o.cfg.DefaultGatewayIPv6, "default-gateway-v6", "DefaultGatewayIPv6"
968	971	}

...	...	@@ -112,7 +112,6 @@ func mirrorsToRegistryHosts(mirrors []string, dHost docker.RegistryHost) []docke
112	112	mirrorHosts = append(mirrorHosts, h)
113	113	}
114	114	return append(mirrorHosts, dHost)
115		-
116	115	}
117	116
118	117	func loadTLSConfig(d string) (*tls.Config, error) {

...	...	@@ -169,5 +169,4 @@ func TestContainerMigrateOS(t *testing.T) {
169	169	assert.DeepEqual(t, tc.expected, ctr.ImagePlatform)
170	170	})
171	171	}
172		-
173	172	}

daemon: gofumpt code