|
 |
5c18b05 |
From b745a2fdd0d29d5ce699841b5f3befeed1d61d28 Mon Sep 17 00:00:00 2001
|
|
|
5c18b05 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
|
5c18b05 |
Date: Mon, 8 Feb 2016 10:33:58 +0100
|
|
|
5c18b05 |
Subject: [PATCH] remove external from imported packages
|
|
|
5c18b05 |
|
|
|
5c18b05 |
---
|
|
|
5c18b05 |
build_test.go | 2 +-
|
|
|
5c18b05 |
client.go | 8 ++++----
|
|
|
5c18b05 |
client_test.go | 2 +-
|
|
|
5c18b05 |
container_test.go | 2 +-
|
|
|
5c18b05 |
tar.go | 4 ++--
|
|
|
5c18b05 |
testing/server.go | 4 ++--
|
|
|
5c18b05 |
6 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
5c18b05 |
|
|
|
5c18b05 |
diff --git a/build_test.go b/build_test.go
|
|
|
5c18b05 |
index c9640f2..3a0a52a 100644
|
|
|
5c18b05 |
--- a/build_test.go
|
|
|
5c18b05 |
+++ b/build_test.go
|
|
|
5c18b05 |
@@ -9,7 +9,7 @@ import (
|
|
|
5c18b05 |
"reflect"
|
|
|
5c18b05 |
"testing"
|
|
|
5c18b05 |
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive"
|
|
|
5c18b05 |
+ "github.com/docker/docker/pkg/archive"
|
|
|
5c18b05 |
)
|
|
|
5c18b05 |
|
|
|
5c18b05 |
func TestBuildImageMultipleContextsError(t *testing.T) {
|
|
|
5c18b05 |
diff --git a/client.go b/client.go
|
|
|
5c18b05 |
index f7a3905..2856753 100644
|
|
|
5c18b05 |
--- a/client.go
|
|
|
5c18b05 |
+++ b/client.go
|
|
|
5c18b05 |
@@ -29,10 +29,10 @@ import (
|
|
|
5c18b05 |
"strings"
|
|
|
5c18b05 |
"time"
|
|
|
5c18b05 |
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts"
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir"
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy"
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp"
|
|
|
5c18b05 |
+ "github.com/docker/docker/opts"
|
|
|
5c18b05 |
+ "github.com/docker/docker/pkg/homedir"
|
|
|
5c18b05 |
+ "github.com/docker/docker/pkg/stdcopy"
|
|
|
5c18b05 |
+ "github.com/hashicorp/go-cleanhttp"
|
|
|
5c18b05 |
)
|
|
|
5c18b05 |
|
|
|
5c18b05 |
const userAgent = "go-dockerclient"
|
|
|
5c18b05 |
diff --git a/client_test.go b/client_test.go
|
|
|
5c18b05 |
index 2dada57..005ceea 100644
|
|
|
5c18b05 |
--- a/client_test.go
|
|
|
5c18b05 |
+++ b/client_test.go
|
|
|
5c18b05 |
@@ -19,7 +19,7 @@ import (
|
|
|
5c18b05 |
"testing"
|
|
|
5c18b05 |
"time"
|
|
|
5c18b05 |
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp"
|
|
|
5c18b05 |
+ "github.com/hashicorp/go-cleanhttp"
|
|
|
5c18b05 |
)
|
|
|
5c18b05 |
|
|
|
5c18b05 |
func TestNewAPIClient(t *testing.T) {
|
|
|
5c18b05 |
diff --git a/container_test.go b/container_test.go
|
|
|
5c18b05 |
index f0879a5..5e2ea3b 100644
|
|
|
5c18b05 |
--- a/container_test.go
|
|
|
5c18b05 |
+++ b/container_test.go
|
|
|
5c18b05 |
@@ -23,7 +23,7 @@ import (
|
|
|
5c18b05 |
"testing"
|
|
|
5c18b05 |
"time"
|
|
|
5c18b05 |
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp"
|
|
|
5c18b05 |
+ "github.com/hashicorp/go-cleanhttp"
|
|
|
5c18b05 |
)
|
|
|
5c18b05 |
|
|
|
5c18b05 |
func TestStateString(t *testing.T) {
|
|
|
5c18b05 |
diff --git a/tar.go b/tar.go
|
|
|
5c18b05 |
index 48042cb..11e51b4 100644
|
|
|
5c18b05 |
--- a/tar.go
|
|
|
5c18b05 |
+++ b/tar.go
|
|
|
5c18b05 |
@@ -13,8 +13,8 @@ import (
|
|
|
5c18b05 |
"path/filepath"
|
|
|
5c18b05 |
"strings"
|
|
|
5c18b05 |
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive"
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils"
|
|
|
5c18b05 |
+ "github.com/docker/docker/pkg/archive"
|
|
|
5c18b05 |
+ "github.com/docker/docker/pkg/fileutils"
|
|
|
5c18b05 |
)
|
|
|
5c18b05 |
|
|
|
5c18b05 |
func createTarStream(srcPath, dockerfilePath string) (io.ReadCloser, error) {
|
|
|
5c18b05 |
diff --git a/testing/server.go b/testing/server.go
|
|
|
5c18b05 |
index 6bd899e..7f4c905 100644
|
|
|
5c18b05 |
--- a/testing/server.go
|
|
|
5c18b05 |
+++ b/testing/server.go
|
|
|
5c18b05 |
@@ -23,8 +23,8 @@ import (
|
|
|
5c18b05 |
"time"
|
|
|
5c18b05 |
|
|
|
5c18b05 |
"github.com/fsouza/go-dockerclient"
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy"
|
|
|
5c18b05 |
- "github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux"
|
|
|
5c18b05 |
+ "github.com/docker/docker/pkg/stdcopy"
|
|
|
5c18b05 |
+ "github.com/gorilla/mux"
|
|
|
5c18b05 |
)
|
|
|
5c18b05 |
|
|
|
5c18b05 |
var nameRegexp = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`)
|
|
|
5c18b05 |
--
|
|
|
5c18b05 |
1.9.3
|
|
|
5c18b05 |
|