svn commit: r490308 - in head/sysutils/docker-freebsd: . files
Jochen Neumeister
joneum at FreeBSD.org
Mon Jan 14 18:09:22 UTC 2019
Author: joneum
Date: Mon Jan 14 18:09:20 2019
New Revision: 490308
URL: https://svnweb.freebsd.org/changeset/ports/490308
Log:
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
MFH: 2019Q1
Sponsored by: Netzkommune GmbH
Added:
head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go (contents, props changed)
head/sysutils/docker-freebsd/files/patch-runconfig_config.go (contents, props changed)
head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go (contents, props changed)
Modified:
head/sysutils/docker-freebsd/Makefile
Modified: head/sysutils/docker-freebsd/Makefile
==============================================================================
--- head/sysutils/docker-freebsd/Makefile Mon Jan 14 17:57:44 2019 (r490307)
+++ head/sysutils/docker-freebsd/Makefile Mon Jan 14 18:09:20 2019 (r490308)
@@ -3,7 +3,7 @@
PORTNAME= docker-freebsd
PORTVERSION= 20150625
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= joneum at FreeBSD.org
Added: head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go Mon Jan 14 18:09:20 2019 (r490308)
@@ -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
+ }
Added: head/sysutils/docker-freebsd/files/patch-runconfig_config.go
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/docker-freebsd/files/patch-runconfig_config.go Mon Jan 14 18:09:20 2019 (r490308)
@@ -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) {
Added: head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go Mon Jan 14 18:09:20 2019 (r490308)
@@ -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
+ }
More information about the svn-ports-head
mailing list