浏览代码

Merge pull request #14878 from icecrime/14756_golint_on_ci

Enable validate-lint as part of CI
Jessie Frazelle 10 年之前
父节点
当前提交
5fdc102396
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. 1 0
      hack/make.sh
  2. 3 0
      pkg/chrootarchive/diff_windows.go

+ 1 - 0
hack/make.sh

@@ -46,6 +46,7 @@ echo
 DEFAULT_BUNDLES=(
 DEFAULT_BUNDLES=(
 	validate-dco
 	validate-dco
 	validate-gofmt
 	validate-gofmt
+	validate-lint
 	validate-pkg
 	validate-pkg
 	validate-test
 	validate-test
 	validate-toml
 	validate-toml

+ 3 - 0
pkg/chrootarchive/diff_windows.go

@@ -9,6 +9,9 @@ import (
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/archive"
 )
 )
 
 
+// ApplyLayer parses a diff in the standard layer format from `layer`, and
+// applies it to the directory `dest`. Returns the size in bytes of the
+// contents of the layer.
 func ApplyLayer(dest string, layer archive.ArchiveReader) (size int64, err error) {
 func ApplyLayer(dest string, layer archive.ArchiveReader) (size int64, err error) {
 	dest = filepath.Clean(dest)
 	dest = filepath.Clean(dest)
 	decompressed, err := archive.DecompressStream(layer)
 	decompressed, err := archive.DecompressStream(layer)