Date: Tue, 15 Jan 2019 08:18:14 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r490353 - in branches/2019Q1/sysutils/docker-freebsd: . files Message-ID: <201901150818.x0F8IEgN053692@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Tue Jan 15 08:18:14 2019 New Revision: 490353 URL: https://svnweb.freebsd.org/changeset/ports/490353 Log: MFH: r490308 Add patch to fix an error: docker run hello-world Error response from daemon: json: cannot set embedded pointer to unexported struct: runconfig.hostConfigWrapper PR: 227618 Sponsored by: Netzkommune GmbH Approved by: ports-secteam (miwi) Added: branches/2019Q1/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go - copied unchanged from r490308, head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go branches/2019Q1/sysutils/docker-freebsd/files/patch-runconfig_config.go - copied unchanged from r490308, head/sysutils/docker-freebsd/files/patch-runconfig_config.go branches/2019Q1/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go - copied unchanged from r490308, head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go Modified: branches/2019Q1/sysutils/docker-freebsd/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/sysutils/docker-freebsd/Makefile ============================================================================== --- branches/2019Q1/sysutils/docker-freebsd/Makefile Tue Jan 15 08:09:44 2019 (r490352) +++ branches/2019Q1/sysutils/docker-freebsd/Makefile Tue Jan 15 08:18:14 2019 (r490353) @@ -3,7 +3,7 @@ PORTNAME= docker-freebsd PORTVERSION= 20150625 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org Copied: branches/2019Q1/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go (from r490308, head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q1/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go Tue Jan 15 08:18:14 2019 (r490353, copy of r490308, head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go) @@ -0,0 +1,9 @@ +--- pkg/system/meminfo_unsupported.go.orig 2015-06-08 13:34:30 UTC ++++ pkg/system/meminfo_unsupported.go +@@ -3,5 +3,5 @@ + package system + + func ReadMemInfo() (*MemInfo, error) { +- return nil, ErrNotSupportedPlatform ++ return &MemInfo{}, ErrNotSupportedPlatform + } Copied: branches/2019Q1/sysutils/docker-freebsd/files/patch-runconfig_config.go (from r490308, head/sysutils/docker-freebsd/files/patch-runconfig_config.go) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q1/sysutils/docker-freebsd/files/patch-runconfig_config.go Tue Jan 15 08:18:14 2019 (r490353, copy of r490308, head/sysutils/docker-freebsd/files/patch-runconfig_config.go) @@ -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) { Copied: branches/2019Q1/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go (from r490308, head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q1/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go Tue Jan 15 08:18:14 2019 (r490353, copy of r490308, head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go) @@ -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 + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901150818.x0F8IEgN053692>