Skip to content
Permalink
Browse files

sysutils/docker-engine: Update to 19.03.2

  • Loading branch information...
decke committed Sep 5, 2019
1 parent 01557e1 commit 7bee8fa37fc1a9e5c9de9f493170ce853aa986d3
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= docker-engine
DISTVERSION= 19.03.1
DISTVERSION= 19.03.2
DISTVERSIONPREFIX= v
CATEGORIES= sysutils

@@ -1,3 +1,3 @@
TIMESTAMP = 1564337630
SHA256 (docker-engine-v19.03.1_GH0.tar.gz) = 187168518cf3d9f2ae4f993504519025d93e6b71d68a12e5f0db87c86787c330
SIZE (docker-engine-v19.03.1_GH0.tar.gz) = 9136400
TIMESTAMP = 1567673816
SHA256 (docker-engine-v19.03.2_GH0.tar.gz) = 7fbd2ac9101026163479023f548acea1537e107b829fd8a0674b1b88a4feecff
SIZE (docker-engine-v19.03.2_GH0.tar.gz) = 9136789
@@ -1,11 +1,11 @@
--- pkg/chrootarchive/chroot_unix.go.orig 2019-06-24 11:59:08 UTC
--- pkg/chrootarchive/chroot_unix.go.orig 2019-08-22 20:57:25 UTC
+++ pkg/chrootarchive/chroot_unix.go
@@ -10,3 +10,8 @@ func chroot(path string) error {
}
return unix.Chdir("/")
@@ -14,3 +14,8 @@ func chroot(path string) error {
func realChroot(path string) error {
return chroot(path)
}
+
+
+func realChroot(path string) error {
+ return chroot(path)
+}
+
@@ -1,4 +1,4 @@
--- vendor/github.com/moby/buildkit/executor/oci/spec_unix.go.orig 2019-06-18 21:30:11 UTC
--- vendor/github.com/moby/buildkit/executor/oci/spec_unix.go.orig 2019-08-22 20:57:25 UTC
+++ vendor/github.com/moby/buildkit/executor/oci/spec_unix.go
@@ -8,7 +8,6 @@ import (
"sync"
@@ -8,7 +8,7 @@
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
@@ -52,7 +51,8 @@ func GenerateSpec(ctx context.Context, meta executor.M
@@ -40,7 +39,8 @@ func GenerateSpec(ctx context.Context, meta executor.M
if meta.SecurityMode == pb.SecurityMode_INSECURE {
opts = append(opts, entitlements.WithInsecureSpec())
} else if system.SeccompSupported() && meta.SecurityMode == pb.SecurityMode_SANDBOX {
@@ -1,16 +1,16 @@
--- vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go.orig 2019-06-18 21:30:11 UTC
--- vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go.orig 2019-08-22 20:57:25 UTC
+++ vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go
@@ -24,7 +24,6 @@ import (
@@ -22,7 +22,6 @@ import (
"github.com/moby/buildkit/identity"
"github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/util/network"
- rootlessspecconv "github.com/moby/buildkit/util/rootless/specconv"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
@@ -241,9 +240,7 @@ func (w *runcExecutor) Exec(ctx context.Context, meta
return err
}
)
@@ -246,9 +245,7 @@ func (w *runcExecutor) Exec(ctx context.Context, meta

spec.Process.OOMScoreAdj = w.oomScoreAdj
if w.rootless {
- if err := rootlessspecconv.ToRootless(spec); err != nil {
- return err

0 comments on commit 7bee8fa

Please sign in to comment.
You can’t perform that action at this time.