Attachment #194534 for bug #227618

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= docker-freebsd	4	PORTNAME= docker-freebsd
5	PORTVERSION= 20150625	5	PORTVERSION= 20150625
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org




--- runconfig/config.go.orig	2015-06-08 13:34:30 UTC
+++ runconfig/config.go
@@ -132,15 +132,15 @@ type Config struct {
 
 type ContainerConfigWrapper struct {
 	*Config
-	*hostConfigWrapper
+	*HostConfigWrapper
 }
 
 func (c ContainerConfigWrapper) HostConfig() *HostConfig {
-	if c.hostConfigWrapper == nil {
+	if c.HostConfigWrapper == nil {
 		return new(HostConfig)
 	}
 
-	return c.hostConfigWrapper.GetHostConfig()
+	return c.HostConfigWrapper.GetHostConfig()
 }
 
 func DecodeContainerConfig(src io.Reader) (*Config, *HostConfig, error) {




--- runconfig/hostconfig.go.orig	2015-06-08 13:34:30 UTC
+++ runconfig/hostconfig.go
@@ -234,18 +234,18 @@ type HostConfig struct {
 func MergeConfigs(config *Config, hostConfig *HostConfig) *ContainerConfigWrapper {
 	return &ContainerConfigWrapper{
 		config,
-		&hostConfigWrapper{InnerHostConfig: hostConfig},
+		&HostConfigWrapper{InnerHostConfig: hostConfig},
 	}
 }
 
-type hostConfigWrapper struct {
+type HostConfigWrapper struct {
 	InnerHostConfig *HostConfig `json:"HostConfig,omitempty"`
 	Cpuset          string      `json:",omitempty"` // Deprecated. Exported for backwards compatibility.
 
 	*HostConfig // Deprecated. Exported to read attrubutes from json that are not in the inner host config structure.
 }
 
-func (w hostConfigWrapper) GetHostConfig() *HostConfig {
+func (w HostConfigWrapper) GetHostConfig() *HostConfig {
 	hc := w.HostConfig
 
 	if hc == nil && w.InnerHostConfig != nil {
@@ -274,7 +274,7 @@ func (w hostConfigWrapper) GetHostConfig
 func DecodeHostConfig(src io.Reader) (*HostConfig, error) {
 	decoder := json.NewDecoder(src)
 
-	var w hostConfigWrapper
+	var w HostConfigWrapper
 	if err := decoder.Decode(&w); err != nil {
 		return nil, err
 	}

Return to bug 227618

Line 0 Link Here

(-)files/patch-runconfig_config.go (+21 lines)
	1	--- runconfig/config.go.orig 2015-06-08 13:34:30 UTC
	2	+++ runconfig/config.go
	3	@@ -132,15 +132,15 @@ type Config struct {
	4
	5	type ContainerConfigWrapper struct {
	6	*Config
	7	- *hostConfigWrapper
	8	+ *HostConfigWrapper
	9	}
	10
	11	func (c ContainerConfigWrapper) HostConfig() *HostConfig {
	12	- if c.hostConfigWrapper == nil {
	13	+ if c.HostConfigWrapper == nil {
	14	return new(HostConfig)
	15	}
	16
	17	- return c.hostConfigWrapper.GetHostConfig()
	18	+ return c.HostConfigWrapper.GetHostConfig()
	19	}
	20
	21	func DecodeContainerConfig(src io.Reader) (Config, HostConfig, error) {

Line 0 Link Here

(-)files/patch-runconfig_hostconfig.go (+33 lines)
	1	--- runconfig/hostconfig.go.orig 2015-06-08 13:34:30 UTC
	2	+++ runconfig/hostconfig.go
	3	@@ -234,18 +234,18 @@ type HostConfig struct {
	4	func MergeConfigs(config Config, hostConfig HostConfig) *ContainerConfigWrapper {
	5	return &ContainerConfigWrapper{
	6	config,
	7	- &hostConfigWrapper{InnerHostConfig: hostConfig},
	8	+ &HostConfigWrapper{InnerHostConfig: hostConfig},
	9	}
	10	}
	11
	12	-type hostConfigWrapper struct {
	13	+type HostConfigWrapper struct {
	14	InnerHostConfig *HostConfig `json:"HostConfig,omitempty"`
	15	Cpuset string `json:",omitempty"` // Deprecated. Exported for backwards compatibility.
	16
	17	*HostConfig // Deprecated. Exported to read attrubutes from json that are not in the inner host config structure.
	18	}
	19
	20	-func (w hostConfigWrapper) GetHostConfig() *HostConfig {
	21	+func (w HostConfigWrapper) GetHostConfig() *HostConfig {
	22	hc := w.HostConfig
	23
	24	if hc == nil && w.InnerHostConfig != nil {
	25	@@ -274,7 +274,7 @@ func (w hostConfigWrapper) GetHostConfig
	26	func DecodeHostConfig(src io.Reader) (*HostConfig, error) {
	27	decoder := json.NewDecoder(src)
	28
	29	- var w hostConfigWrapper
	30	+ var w HostConfigWrapper
	31	if err := decoder.Decode(&w); err != nil {
	32	return nil, err
	33	}