Merge pull request #3330 from shykes/pkg-term

Move utility package 'term' to pkg/term
2026-01-11 18:51:37 +00:00 · 2013-12-23 16:11:42 -08:00
parent 0d207abf8e 7ce7516c12
commit e6e35e5984
8 changed files with 4 additions and 4 deletions
--- a/commands.go
+++ b/commands.go
@@ -13,7 +13,7 @@ import (
 	"github.com/dotcloud/docker/auth"
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/registry"
-	"github.com/dotcloud/docker/term"
+	"github.com/dotcloud/docker/pkg/term"
 	"github.com/dotcloud/docker/utils"
 	"io"
 	"io/ioutil"
--- a/container.go
+++ b/container.go
@@ -8,7 +8,7 @@ import (
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/graphdriver"
 	"github.com/dotcloud/docker/mount"
-	"github.com/dotcloud/docker/term"
+	"github.com/dotcloud/docker/pkg/term"
 	"github.com/dotcloud/docker/utils"
 	"github.com/kr/pty"
 	"io"
--- a/integration/commands_test.go
+++ b/integration/commands_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"github.com/dotcloud/docker"
 	"github.com/dotcloud/docker/engine"
-	"github.com/dotcloud/docker/term"
+	"github.com/dotcloud/docker/pkg/term"
 	"github.com/dotcloud/docker/utils"
 	"io"
 	"io/ioutil"
--- a/pkg/term/MAINTAINERS
+++ b/pkg/term/MAINTAINERS
--- a/pkg/term/term.go
+++ b/pkg/term/term.go
--- a/pkg/term/termios_darwin.go
+++ b/pkg/term/termios_darwin.go
--- a/pkg/term/termios_linux.go
+++ b/pkg/term/termios_linux.go
--- a/utils/jsonmessage.go
+++ b/utils/jsonmessage.go
@@ -3,7 +3,7 @@ package utils
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/dotcloud/docker/term"
+	"github.com/dotcloud/docker/pkg/term"
 	"io"
 	"strings"
 	"time"