Skip to content

Commit 96c4816

Browse files
crosbymichaelcrosbymichael
committed
Move graphdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
1 parent af38515 commit 96c4816

31 files changed

Lines changed: 19 additions & 19 deletions

‎contrib/docker-device-tool/device_tool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"flag"
55
"fmt"
6-
"github.com/dotcloud/docker/graphdriver/devmapper"
6+
"github.com/dotcloud/docker/runtime/graphdriver/devmapper"
77
"os"
88
"path"
99
"sort"

‎graph/graph.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"github.com/dotcloud/docker/archive"
66
"github.com/dotcloud/docker/dockerversion"
7-
"github.com/dotcloud/docker/graphdriver"
7+
"github.com/dotcloud/docker/runtime/graphdriver"
88
"github.com/dotcloud/docker/image"
99
"github.com/dotcloud/docker/runconfig"
1010
"github.com/dotcloud/docker/utils"

‎graph/tags_unit_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package graph
22

33
import (
44
"bytes"
5-
"github.com/dotcloud/docker/graphdriver"
6-
_ "github.com/dotcloud/docker/graphdriver/vfs" // import the vfs driver so it is used in the tests
5+
"github.com/dotcloud/docker/runtime/graphdriver"
6+
_ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
77
"github.com/dotcloud/docker/image"
88
"github.com/dotcloud/docker/utils"
99
"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

‎image/graph.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package image
22

33
import (
4-
"github.com/dotcloud/docker/graphdriver"
4+
"github.com/dotcloud/docker/runtime/graphdriver"
55
)
66

77
type Graph interface {

‎image/image.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"fmt"
66
"github.com/dotcloud/docker/archive"
7-
"github.com/dotcloud/docker/graphdriver"
7+
"github.com/dotcloud/docker/runtime/graphdriver"
88
"github.com/dotcloud/docker/runconfig"
99
"github.com/dotcloud/docker/utils"
1010
"io/ioutil"

‎integration/graph_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/dotcloud/docker/archive"
66
"github.com/dotcloud/docker/dockerversion"
77
"github.com/dotcloud/docker/graph"
8-
"github.com/dotcloud/docker/graphdriver"
8+
"github.com/dotcloud/docker/runtime/graphdriver"
99
"github.com/dotcloud/docker/image"
1010
"github.com/dotcloud/docker/utils"
1111
"io"

‎runtime/container.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/dotcloud/docker/archive"
88
"github.com/dotcloud/docker/engine"
99
"github.com/dotcloud/docker/runtime/execdriver"
10-
"github.com/dotcloud/docker/graphdriver"
10+
"github.com/dotcloud/docker/runtime/graphdriver"
1111
"github.com/dotcloud/docker/image"
1212
"github.com/dotcloud/docker/links"
1313
"github.com/dotcloud/docker/nat"

graphdriver/aufs/aufs.go renamed to runtime/graphdriver/aufs/aufs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"bufio"
2525
"fmt"
2626
"github.com/dotcloud/docker/archive"
27-
"github.com/dotcloud/docker/graphdriver"
27+
"github.com/dotcloud/docker/runtime/graphdriver"
2828
mountpk "github.com/dotcloud/docker/pkg/mount"
2929
"github.com/dotcloud/docker/utils"
3030
"os"

graphdriver/aufs/aufs_test.go renamed to runtime/graphdriver/aufs/aufs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/hex"
66
"fmt"
77
"github.com/dotcloud/docker/archive"
8-
"github.com/dotcloud/docker/graphdriver"
8+
"github.com/dotcloud/docker/runtime/graphdriver"
99
"io/ioutil"
1010
"os"
1111
"path"

graphdriver/aufs/dirs.go renamed to runtime/graphdriver/aufs/dirs.go

File renamed without changes.

0 commit comments

Comments
 (0)