svn commit: r477042 - in head/sysutils/docker: . files
Nikolai Lifanov
lifanov at FreeBSD.org
Sun Aug 12 23:15:57 UTC 2018
Author: lifanov
Date: Sun Aug 12 23:15:55 2018
New Revision: 477042
URL: https://svnweb.freebsd.org/changeset/ports/477042
Log:
update sysutils/docker to 18.06.0
Changes: https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce
PR: 230336
Submitted by: Dmitri Goutnik <dg at syrec.org>
Added:
head/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go (contents, props changed)
head/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go (contents, props changed)
Deleted:
head/sysutils/docker/files/pass_freebsd.go
Modified:
head/sysutils/docker/Makefile
head/sysutils/docker/distinfo
head/sysutils/docker/files/default_store_freebsd.go
Modified: head/sysutils/docker/Makefile
==============================================================================
--- head/sysutils/docker/Makefile Sun Aug 12 23:10:49 2018 (r477041)
+++ head/sysutils/docker/Makefile Sun Aug 12 23:15:55 2018 (r477042)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= docker
-PORTVERSION= 18.03.0
+PORTVERSION= 18.06.0
DISTVERSIONPREFIX= v
DISTVERSIONSUFFIX= -ce
CATEGORIES= sysutils
@@ -26,7 +26,5 @@ pre-build:
@${MV} ${GO_WRKSRC}/components/* ${GO_WRKSRC}/
@${CP} ${FILESDIR}/default_store_freebsd.go \
${GO_WRKSRC}/cli/cli/config/credentials/
- @${CP} ${FILESDIR}/pass_freebsd.go \
- ${GO_WRKSRC}/cli/vendor/github.com/docker/docker-credential-helpers/pass/
.include <bsd.port.mk>
Modified: head/sysutils/docker/distinfo
==============================================================================
--- head/sysutils/docker/distinfo Sun Aug 12 23:10:49 2018 (r477041)
+++ head/sysutils/docker/distinfo Sun Aug 12 23:15:55 2018 (r477042)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522780844
-SHA256 (docker-docker-ce-v18.03.0-ce_GH0.tar.gz) = 07651973b4a4adac86599b5c1abc9b1c82aa143ac18205ff399afa814d403280
-SIZE (docker-docker-ce-v18.03.0-ce_GH0.tar.gz) = 12751925
+TIMESTAMP = 1533309208
+SHA256 (docker-docker-ce-v18.06.0-ce_GH0.tar.gz) = 18754ecb38d7c210fb2b96ee618dc2bdf94e66cd501d4eef0c685903a83e8501
+SIZE (docker-docker-ce-v18.06.0-ce_GH0.tar.gz) = 13656557
Modified: head/sysutils/docker/files/default_store_freebsd.go
==============================================================================
--- head/sysutils/docker/files/default_store_freebsd.go Sun Aug 12 23:10:49 2018 (r477041)
+++ head/sysutils/docker/files/default_store_freebsd.go Sun Aug 12 23:15:55 2018 (r477042)
@@ -1,11 +1,11 @@
package credentials
import (
- "github.com/docker/docker-credential-helpers/pass"
+ "os/exec"
)
func defaultCredentialsStore() string {
- if pass.PassInitialized {
+ if _, err := exec.LookPath("pass"); err == nil {
return "pass"
}
Added: head/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go Sun Aug 12 23:15:55 2018 (r477042)
@@ -0,0 +1,11 @@
+--- components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-08-03 16:04:11 UTC
++++ components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
+@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc)
+
+ if filter != nil {
+ // filter out entries we're not interested in
+- skip, stop = filter(p)
++ skip, stop = filter(&mountinfo)
+ if skip {
+ continue
+ }
Added: head/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go Sun Aug 12 23:15:55 2018 (r477042)
@@ -0,0 +1,8 @@
+--- components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go.orig 2018-08-03 15:31:57 UTC
++++ components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go
+@@ -1,4 +1,4 @@
+-// +build !linux
++// +build !linux,!freebsd
+
+ package fsutil
+
More information about the svn-ports-head
mailing list