Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!

IT'S ABOUT TIME. 🎉 Signed-off-by: Andrew "Tianon" Page <[email protected]>
mattyb · May 1, 2015 · 576985a · 576985a
1 parent 1f2f3db
commit 576985a
Show file tree

Hide file tree

Showing 40 changed files with 16 additions and 3,229 deletions.
diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
@@ -1,6 +1,7 @@
 package graph
 
 import (
+	"archive/tar"
 	"bytes"
 	"io"
 	"os"
@@ -12,7 +13,6 @@ import (
 	_ "github.com/docker/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/utils"
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 const (

diff --git a/hack/vendor.sh b/hack/vendor.sh
@@ -59,17 +59,6 @@ clone git github.com/go-fsnotify/fsnotify v1.0.4
 
 clone git github.com/go-check/check 64131543e7896d5bcc6bd5a76287eb75ea96c673
 
-# get Go tip's archive/tar, for xattr support and improved performance
-# TODO after Go 1.4 drops, bump our minimum supported version and drop this vendored dep
-if [ "$1" = '--go' ]; then
-	# Go takes forever and a half to clone, so we only redownload it when explicitly requested via the "--go" flag to this script.
-	clone hg code.google.com/p/go 1b17b3426e3c
-	mv src/code.google.com/p/go/src/pkg/archive/tar tmp-tar
-	rm -rf src/code.google.com/p/go
-	mkdir -p src/code.google.com/p/go/src/pkg/archive
-	mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar
-fi
-
 # get distribution packages
 clone git github.com/docker/distribution d957768537c5af40e4f4cd96871f7b2bde9e2923
 mv src/github.com/docker/distribution/digest tmp-digest

diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"archive/tar"
 	"bytes"
 	"encoding/json"
 	"io"
@@ -11,7 +12,6 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 	"github.com/go-check/check"
 )
 

diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go
@@ -1,14 +1,14 @@
 package main
 
 import (
+	"archive/tar"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"strings"
 	"time"
 
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 	"github.com/go-check/check"
 )
 

diff --git a/integration-cli/utils.go b/integration-cli/utils.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"archive/tar"
 	"bytes"
 	"encoding/json"
 	"errors"
@@ -17,7 +18,6 @@ import (
 	"time"
 
 	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 func getExitCode(err error) (int, error) {

diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
@@ -1,6 +1,7 @@
 package archive
 
 import (
+	"archive/tar"
 	"bufio"
 	"bytes"
 	"compress/bzip2"
@@ -16,8 +17,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
-
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/fileutils"
 	"github.com/docker/docker/pkg/pools"

diff --git a/pkg/archive/archive_test.go b/pkg/archive/archive_test.go
@@ -1,6 +1,7 @@
 package archive
 
 import (
+	"archive/tar"
 	"bytes"
 	"fmt"
 	"io"
@@ -15,7 +16,6 @@ import (
 	"time"
 
 	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 func TestIsArchiveNilHeader(t *testing.T) {

diff --git a/pkg/archive/archive_unix.go b/pkg/archive/archive_unix.go
@@ -3,11 +3,10 @@
 package archive
 
 import (
+	"archive/tar"
 	"errors"
 	"os"
 	"syscall"
-
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 // canonicalTarNameForPath returns platform-specific filepath

diff --git a/pkg/archive/archive_windows.go b/pkg/archive/archive_windows.go
@@ -3,11 +3,10 @@
 package archive
 
 import (
+	"archive/tar"
 	"fmt"
 	"os"
 	"strings"
-
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 // canonicalTarNameForPath returns platform-specific filepath

diff --git a/pkg/archive/changes.go b/pkg/archive/changes.go
@@ -1,6 +1,7 @@
 package archive
 
 import (
+	"archive/tar"
 	"bytes"
 	"fmt"
 	"io"
@@ -11,8 +12,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
-
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/pools"
 	"github.com/docker/docker/pkg/system"

diff --git a/pkg/archive/diff.go b/pkg/archive/diff.go
@@ -1,6 +1,7 @@
 package archive
 
 import (
+	"archive/tar"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -9,8 +10,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
-
 	"github.com/docker/docker/pkg/pools"
 	"github.com/docker/docker/pkg/system"
 )

diff --git a/pkg/archive/diff_test.go b/pkg/archive/diff_test.go
@@ -1,9 +1,8 @@
 package archive
 
 import (
+	"archive/tar"
 	"testing"
-
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 func TestApplyLayerInvalidFilenames(t *testing.T) {

diff --git a/pkg/archive/utils_test.go b/pkg/archive/utils_test.go
@@ -1,15 +1,14 @@
 package archive
 
 import (
+	"archive/tar"
 	"bytes"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"time"
-
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 var testUntarFns = map[string]func(string, io.Reader) error{

diff --git a/pkg/archive/wrap.go b/pkg/archive/wrap.go
@@ -1,8 +1,8 @@
 package archive
 
 import (
+	"archive/tar"
 	"bytes"
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 	"io/ioutil"
 )
 

diff --git a/pkg/tarsum/tarsum.go b/pkg/tarsum/tarsum.go
@@ -1,6 +1,7 @@
 package tarsum
 
 import (
+	"archive/tar"
 	"bytes"
 	"compress/gzip"
 	"crypto"
@@ -11,8 +12,6 @@ import (
 	"hash"
 	"io"
 	"strings"
-
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 const (

diff --git a/pkg/tarsum/tarsum_test.go b/pkg/tarsum/tarsum_test.go
@@ -1,6 +1,7 @@
 package tarsum
 
 import (
+	"archive/tar"
 	"bytes"
 	"compress/gzip"
 	"crypto/md5"
@@ -14,8 +15,6 @@ import (
 	"io/ioutil"
 	"os"
 	"testing"
-
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 type testLayer struct {

diff --git a/pkg/tarsum/versioning.go b/pkg/tarsum/versioning.go
@@ -1,12 +1,11 @@
 package tarsum
 
 import (
+	"archive/tar"
 	"errors"
 	"sort"
 	"strconv"
 	"strings"
-
-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 // versioning of the TarSum algorithm