moby-buildkit-disable-stuff
authorDmitry Smirnov <onlyjob@debian.org>
Sat, 26 Jan 2019 01:54:38 +0000 (01:54 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sat, 26 Jan 2019 01:54:38 +0000 (01:54 +0000)
Gbp-Pq: Name moby-buildkit-disable-stuff.patch

engine/vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go

index 5225d5fc564e1a5a8daec2e55d6abff455de2d09..ef7cc0595f2c4d9f96f23fb39f33e08409e1fe3e 100644 (file)
@@ -21,7 +21,7 @@ import (
        "github.com/moby/buildkit/executor"
        "github.com/moby/buildkit/executor/oci"
        "github.com/moby/buildkit/identity"
-       rootlessspecconv "github.com/moby/buildkit/util/rootless/specconv"
+//     rootlessspecconv "github.com/moby/buildkit/util/rootless/specconv"
        "github.com/moby/buildkit/util/system"
        "github.com/opencontainers/runtime-spec/specs-go"
        "github.com/pkg/errors"
@@ -175,9 +175,10 @@ func (w *runcExecutor) Exec(ctx context.Context, meta executor.Meta, root cache.
                return err
        }
        if w.rootless {
-               if err := rootlessspecconv.ToRootless(spec); err != nil {
-                       return err
-               }
+return errors.New("not implemented")
+//             if err := rootlessspecconv.ToRootless(spec); err != nil {
+//                     return err
+//             }
        }
 
        if err := json.NewEncoder(f).Encode(spec); err != nil {