Attachment 194650 Details for Bug 227618 – Fix 'docker run' on Go 1.10 and workaround 'docker info' crash

[patch] Fix 'docker run' on Go 1.10 and workaround 'docker info' crash

docker-freebsd-go-1.10.patch (text/plain), 4.07 KB, created by Ting-Wei Lan on 2018-06-26 14:12:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ting-Wei Lan

Created: 2018-06-26 14:12:31 UTC

Size: 4.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 473305)
>+++ 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-pkg_system_meminfo__unsupported.go
>===================================================================
>--- files/patch-pkg_system_meminfo__unsupported.go	(nonexistent)
>+++ files/patch-pkg_system_meminfo__unsupported.go	(working copy)
>@@ -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
>+ }
>
>Property changes on: files/patch-pkg_system_meminfo__unsupported.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_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

Actions: View | Diff

Attachments on bug 227618: 194534 | 194650