Index: head/sysutils/docker-freebsd/Makefile =================================================================== --- head/sysutils/docker-freebsd/Makefile (revision 490307) +++ head/sysutils/docker-freebsd/Makefile (revision 490308) @@ -1,37 +1,37 @@ # Created by: kmoore@FreeBSD.org # $FreeBSD$ PORTNAME= docker-freebsd PORTVERSION= 20150625 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= joneum@FreeBSD.org COMMENT= Docker containment system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go>=1.4:lang/go \ bash:shells/bash \ sqlite3:databases/sqlite3 RUN_DEPENDS= go>=1.4:lang/go \ bash:shells/bash \ sqlite3:databases/sqlite3 USE_GITHUB= yes GH_ACCOUNT= kvasdopil GH_PROJECT= docker GH_TAGNAME= 582db78 PLIST_FILES= bin/docker USE_RC_SUBR= docker do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} AUTO_GOPATH=1 DOCKER_GITCOMMIT=${GH_TAGNAME} ./hack/make.sh binary do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bundles/latest/binary/docker ${STAGEDIR}${PREFIX}/bin/ .include Index: head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go =================================================================== --- head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go (nonexistent) +++ head/sysutils/docker-freebsd/files/patch-pkg_system_meminfo__unsupported.go (revision 490308) @@ -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: head/sysutils/docker-freebsd/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: head/sysutils/docker-freebsd/files/patch-runconfig_config.go =================================================================== --- head/sysutils/docker-freebsd/files/patch-runconfig_config.go (nonexistent) +++ head/sysutils/docker-freebsd/files/patch-runconfig_config.go (revision 490308) @@ -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: head/sysutils/docker-freebsd/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: head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go =================================================================== --- head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go (nonexistent) +++ head/sysutils/docker-freebsd/files/patch-runconfig_hostconfig.go (revision 490308) @@ -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: head/sysutils/docker-freebsd/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