clean and remove fuse

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>

Author: jessfraz

Dockerfile

@@ -26,7 +26,6 @@ FROM alpine
 MAINTAINER Jessica Frazelle <jess@linux.com>
 RUN apk add --no-cache \
 	bash \
-	fuse \
 	git \
 	shadow \
 	shadow-uidmap \

Gopkg.lock

@@ -36,10 +36,6 @@
   name = "github.com/moby/buildkit"
   branch = "master"
 
-[[override]]
-  name = "github.com/hanwen/go-fuse"
-  revision = "master"
-
 [[override]]
   name = "github.com/grpc-ecosystem/grpc-opentracing"
   revision = "420e5c3331a082e0c873adeeab1819fe1749dd0b"

Gopkg.toml

@@ -62,8 +62,6 @@ compiled from the following branch: [AkihiroSuda/runc/tree/demo-rootless](https:
 You need to have `runc` (see the top section for rootless mode) and `newuidmap` installed.
 On Ubuntu, `newuidmap` is provided by the `uidmap` package.
 
-For the FUSE backend, you will also need `fusermount` installed.
-
 NOTE: These steps work only for Linux. Compile and run in a container (explained below) if you're on Windows or MacOS.
 
 #### Binaries
@@ -131,7 +129,7 @@ Build an image from a Dockerfile.
 
 Flags:
 
-  -backend    backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend    backend for snapshots ([auto native overlayfs]) (default: auto)
   -build-arg  Set build-time variables (default: [])
   -d          enable debug logging (default: false)
   -f          Name of the Dockerfile (Default is 'PATH/Dockerfile') (default: <none>)
@@ -184,7 +182,7 @@ List images and digests.
 
 Flags:
 
-  -backend  backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend  backend for snapshots ([auto native overlayfs]) (default: auto)
   -d        enable debug logging (default: false)
   -f        Filter output based on conditions provided (default: [])
   -state    directory to hold the global state (default: /tmp/img)
@@ -207,7 +205,7 @@ Pull an image or a repository from a registry.
 
 Flags:
 
-  -backend  backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend  backend for snapshots ([auto native overlayfs]) (default: auto)
   -d        enable debug logging (default: false)
   -state    directory to hold the global state (default: /tmp/img)
 ```
@@ -229,7 +227,7 @@ Push an image or a repository to a registry.
 
 Flags:
 
-  -backend  backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend  backend for snapshots ([auto native overlayfs]) (default: auto)
   -d        enable debug logging (default: false)
   -state    directory to hold the global state (default: /tmp/img)
 ```
@@ -250,7 +248,7 @@ Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE.
 
 Flags:
 
-  -backend  backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend  backend for snapshots ([auto native overlayfs]) (default: auto)
   -d        enable debug logging (default: false)
   -state    directory to hold the global state (default: /tmp/img)
 ```
@@ -270,7 +268,7 @@ Save an image to a tar archive (streamed to STDOUT by default).
 
 Flags:
 
-  -backend  backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend  backend for snapshots ([auto native overlayfs]) (default: auto)
   -d        enable debug logging (default: false)
   -o        Write to a file, instead of STDOUT (default: <none>)
   -state    directory to hold the global state (default: /tmp/img)
@@ -294,7 +292,7 @@ Remove one or more images.
 
 Flags:
 
-  -backend  backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend  backend for snapshots ([auto native overlayfs]) (default: auto)
   -d        enable debug logging (default: false)
   -state    directory to hold the global state (default: /tmp/img)
 ```
@@ -309,7 +307,7 @@ Show image disk usage.
 
 Flags:
 
-  -backend  backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend  backend for snapshots ([auto native overlayfs]) (default: auto)
   -d        enable debug logging (default: false)
   -f        Filter output based on conditions provided (snapshot ID supported) (default: <none>)
   -state    directory to hold the global state (default: /tmp/img)
@@ -342,7 +340,7 @@ If no server is specified, the default (https://index.docker.io/v1/) is used.
 
 Flags:
 
-  -backend         backend for snapshots ([auto fuse native overlayfs]) (default: auto)
+  -backend         backend for snapshots ([auto native overlayfs]) (default: auto)
   -d               enable debug logging (default: false)
   -p               Password (default: <none>)
   -password-stdin  Take the password from stdin (default: false)
@@ -377,11 +375,6 @@ You can also use `overlayfs`
 backend, but that requires a kernel patch from Ubuntu to be unprivileged, 
 see [#22](https://github.com/genuinetools/img/issues/22).
 
-#### fuse
-
-The `fuse` backend runs completely in userspace. It is a bit buggy and a work
-in progress so hang tight.
-
 ### Unprivileged Mounting
 
 To mount a filesystem without root accses, `img` automatically invokes [`newuidmap(1)`](http://man7.org/linux/man-pages/man1/newuidmap.1.html)/[`newgidmap(1)`](http://man7.org/linux/man-pages/man1/newgidmap.1.html) SUID binaries to prepare SUBUIDs/SUBGIDs, which is typically required by `apt`.

README.md

@@ -6,7 +6,6 @@ import (
 
 	"github.com/containerd/containerd/snapshots/overlay"
 	"github.com/genuinetools/img/types"
-	"github.com/hanwen/go-fuse/fuse"
 	"github.com/moby/buildkit/control"
 	"github.com/moby/buildkit/session"
 	"github.com/sirupsen/logrus"
@@ -19,8 +18,6 @@ type Client struct {
 	localDirs map[string]string
 	root      string
 
-	fuseserver *fuse.Server
-
 	sessionManager *session.Manager
 	controller     *control.Controller
 }
@@ -54,13 +51,7 @@ func New(root, backend string, localDirs map[string]string) (*Client, error) {
 	}, nil
 }
 
-// Close terminates the client and unmount the fuseserver if it is mounted.
-func (c *Client) Close() {
-	if c.fuseserver == nil {
-		return
-	}
-
-	if err := c.fuseserver.Unmount(); err != nil {
-		logrus.Errorf("Unmounting FUSE server failed: %v", err)
-	}
-}
+// Close safely closes the client.
+// This used to shut down the FUSE server but since that was removed
+// it is basically a no-op now.
+func (c *Client) Close() {}

client/client.go

@@ -21,6 +21,8 @@ func (c *Client) getSessionManager() (*session.Manager, error) {
 	return c.sessionManager, nil
 }
 
+// Session creates the session manager and returns the session and it's
+// dialer.
 func (c *Client) Session(ctx context.Context) (*session.Session, session.Dialer, error) {
 	m, err := c.getSessionManager()
 	if err != nil {

client/session.go

@@ -15,7 +15,6 @@ import (
 	"github.com/containerd/containerd/snapshots/native"
 	"github.com/containerd/containerd/snapshots/overlay"
 	"github.com/genuinetools/img/executor/runc"
-	"github.com/genuinetools/img/snapshots/fuse"
 	"github.com/genuinetools/img/types"
 	"github.com/moby/buildkit/cache/metadata"
 	containerdsnapshot "github.com/moby/buildkit/snapshot/containerd"
@@ -46,8 +45,6 @@ func (c *Client) createWorkerOpt() (opt base.WorkerOpt, err error) {
 		s ctdsnapshot.Snapshotter
 	)
 	switch c.backend {
-	case types.FUSEBackend:
-		s, c.fuseserver, err = fuse.NewSnapshotter(snapshotRoot)
 	case types.NativeBackend:
 		s, err = native.NewSnapshotter(snapshotRoot)
 	case types.OverlayFSBackend:

client/workeropt.go

@@ -30,7 +30,7 @@ var (
 
 	defaultStateDirectory = "/tmp/img"
 
-	validBackends = []string{types.AutoBackend, types.FUSEBackend, types.NativeBackend, types.OverlayFSBackend}
+	validBackends = []string{types.AutoBackend, types.NativeBackend, types.OverlayFSBackend}
 )
 
 type command interface {