Index: Makefile =================================================================== --- Makefile (revision 473112) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= docker-freebsd PORTVERSION= 20150625 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org Index: files/patch-runconfig_config.go =================================================================== --- files/patch-runconfig_config.go (nonexistent) +++ files/patch-runconfig_config.go (working copy) @@ -0,0 +1,21 @@ +--- 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) { Property changes on: files/patch-runconfig_config.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-runconfig_hostconfig.go =================================================================== --- files/patch-runconfig_hostconfig.go (nonexistent) +++ files/patch-runconfig_hostconfig.go (working copy) @@ -0,0 +1,33 @@ +--- 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 + } Property changes on: files/patch-runconfig_hostconfig.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property