Skip to content
Permalink
Browse files

sysutils/docker-engine: Update to 19.03.0-rc3

  • Loading branch information
decke committed Jun 24, 2019
1 parent c95b961 commit eeff9bdd50f5a09ea10a1967ab0543ea39afd936
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= docker-engine
PORTVERSION= 18.09.5
DISTVERSION= 19.03.0-rc3
DISTVERSIONPREFIX= v
CATEGORIES= sysutils

@@ -11,6 +11,8 @@ COMMENT= Docker Engine based on moby
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= bash:shells/bash

USES= go

USE_GITHUB= yes
@@ -1,3 +1,3 @@
TIMESTAMP = 1555061951
SHA256 (docker-engine-v18.09.5_GH0.tar.gz) = f6c1f2cff88c1f143fe9c16ea6555eace68ef17a5b7803dc5d5fa0a1f45a3a97
SIZE (docker-engine-v18.09.5_GH0.tar.gz) = 8559186
TIMESTAMP = 1561360750
SHA256 (docker-engine-v19.03.0-rc3_GH0.tar.gz) = 3d434fca6bd362799bf22d4aad3dfa6e22113ffb9fc43abb3584545f0892d64d
SIZE (docker-engine-v19.03.0-rc3_GH0.tar.gz) = 9136729
@@ -1,6 +1,6 @@
--- pkg/archive/archive_unix.go.orig 2019-02-06 23:39:49 UTC
--- pkg/archive/archive_unix.go.orig 2019-06-18 21:30:11 UTC
+++ pkg/archive/archive_unix.go
@@ -62,7 +62,7 @@ func getInodeFromStat(stat interface{}) (inode uint64,
@@ -63,7 +63,7 @@ func getInodeFromStat(stat interface{}) (inode uint64,
s, ok := stat.(*syscall.Stat_t)

if ok {
@@ -1,6 +1,6 @@
--- pkg/archive/changes_unix.go.orig 2019-02-06 23:39:49 UTC
--- pkg/archive/changes_unix.go.orig 2019-06-18 21:30:11 UTC
+++ pkg/archive/changes_unix.go
@@ -29,7 +29,7 @@ func (info *FileInfo) isDir() bool {
@@ -35,7 +35,7 @@ func (info *FileInfo) isDir() bool {
}

func getIno(fi os.FileInfo) uint64 {
@@ -0,0 +1,20 @@
--- 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
@@ -8,7 +8,6 @@ import (
"sync"

"github.com/containerd/containerd/containers"
- "github.com/containerd/containerd/contrib/seccomp"
"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
if meta.SecurityMode == pb.SecurityMode_INSECURE {
opts = append(opts, entitlements.WithInsecureSpec())
} else if system.SeccompSupported() && meta.SecurityMode == pb.SecurityMode_SANDBOX {
- opts = append(opts, seccomp.WithDefaultProfile())
+ // TODO
+ return nil, nil, errors.New("TODO Seccomp Sandbox not supported on FreeBSD")
}

switch processMode {
@@ -1,38 +1,21 @@
--- vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go.orig 2019-02-06 23:39:49 UTC
--- 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
@@ -13,7 +13,6 @@ import (
"syscall"
"time"

- "github.com/containerd/containerd/contrib/seccomp"
"github.com/containerd/containerd/mount"
containerdoci "github.com/containerd/containerd/oci"
"github.com/containerd/continuity/fs"
@@ -24,7 +23,6 @@ import (
@@ -24,7 +24,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"
"github.com/moby/buildkit/util/system"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
@@ -177,7 +175,7 @@ func (w *runcExecutor) Exec(ctx context.Context, meta

opts := []containerdoci.SpecOpts{oci.WithUIDGID(uid, gid, sgids)}
if system.SeccompSupported() {
- opts = append(opts, seccomp.WithDefaultProfile())
+ // TODO
}
if meta.ReadonlyRootFS {
opts = append(opts, containerdoci.WithRootFSReadonly())
@@ -216,9 +214,7 @@ func (w *runcExecutor) Exec(ctx context.Context, meta
"github.com/sirupsen/logrus"
@@ -241,9 +240,7 @@ func (w *runcExecutor) Exec(ctx context.Context, meta
return err
}
if w.rootless {
- if err := rootlessspecconv.ToRootless(spec); err != nil {
- return err
- }
+ // TODO
+ return errors.New("TODO: Rootless not implemented in FreeBSD!")
}

if err := json.NewEncoder(f).Encode(spec); err != nil {
@@ -1,11 +1,11 @@
--- vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2019-02-06 23:39:49 UTC
--- vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2019-06-18 21:30:11 UTC
+++ vendor/github.com/tonistiigi/fsutil/stat_unix.go
@@ -45,7 +45,7 @@ func setUnixOpt(fi os.FileInfo, stat *types.Stat, path
stat.Devminor = int64(minor(uint64(s.Rdev)))
}

- ino := s.Ino
+ ino := uint64(s.Ino)
linked := false
if seenFiles != nil {
if s.Nlink > 1 {
if oldpath, ok := seenFiles[ino]; ok {

0 comments on commit eeff9bd

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