Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 531f590

Browse filesBrowse files
tiborvasstiborvass
committed
Merge pull request moby#7324 from erikh/move_tarsum
Move tarsum to pkg/
2 parents 1f2d757 + ff02bea commit 531f590
Copy full SHA for 531f590

8 files changed

+13-9Lines changed: 13 additions & 9 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎builder/builder.go‎

Copy file name to clipboardExpand all lines: builder/builder.go
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/docker/docker/pkg/parsers"
2727
"github.com/docker/docker/pkg/symlink"
2828
"github.com/docker/docker/pkg/system"
29+
"github.com/docker/docker/pkg/tarsum"
2930
"github.com/docker/docker/registry"
3031
"github.com/docker/docker/runconfig"
3132
"github.com/docker/docker/utils"
@@ -50,7 +51,7 @@ type buildFile struct {
5051
config *runconfig.Config
5152

5253
contextPath string
53-
context *utils.TarSum
54+
context *tarsum.TarSum
5455

5556
verbose bool
5657
utilizeCache bool
@@ -555,7 +556,7 @@ func (b *buildFile) runContextCommand(args string, allowRemote bool, allowDecomp
555556
if err != nil {
556557
return err
557558
}
558-
tarSum := &utils.TarSum{Reader: r, DisableCompression: true}
559+
tarSum := &tarsum.TarSum{Reader: r, DisableCompression: true}
559560
if _, err := io.Copy(ioutil.Discard, tarSum); err != nil {
560561
return err
561562
}
@@ -777,7 +778,7 @@ func (b *buildFile) Build(context io.Reader) (string, error) {
777778
return "", err
778779
}
779780

780-
b.context = &utils.TarSum{Reader: decompressedStream, DisableCompression: true}
781+
b.context = &tarsum.TarSum{Reader: decompressedStream, DisableCompression: true}
781782
if err := archive.Untar(b.context, tmpdirPath, nil); err != nil {
782783
return "", err
783784
}
Collapse file

‎utils/tarsum.go‎ ‎pkg/tarsum/tarsum.go‎utils/tarsum.go renamed to pkg/tarsum/tarsum.go

Copy file name to clipboardExpand all lines: pkg/tarsum/tarsum.go
+6-4Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
package utils
1+
package tarsum
22

33
import (
44
"bytes"
55
"compress/gzip"
66
"crypto/sha256"
77
"encoding/hex"
8-
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
98
"hash"
109
"io"
10+
"log"
1111
"sort"
1212
"strconv"
1313
"strings"
14+
15+
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
1416
)
1517

1618
type TarSum struct {
@@ -168,11 +170,11 @@ func (ts *TarSum) Sum(extra []byte) string {
168170
h.Write(extra)
169171
}
170172
for _, sum := range sums {
171-
Debugf("-->%s<--", sum)
173+
log.Printf("-->%s<--", sum)
172174
h.Write([]byte(sum))
173175
}
174176
checksum := "tarsum+sha256:" + hex.EncodeToString(h.Sum(nil))
175-
Debugf("checksum processed: %s", checksum)
177+
log.Printf("checksum processed: %s", checksum)
176178
return checksum
177179
}
178180

Collapse file

‎utils/tarsum_test.go‎ ‎pkg/tarsum/tarsum_test.go‎utils/tarsum_test.go renamed to pkg/tarsum/tarsum_test.go

Copy file name to clipboardExpand all lines: pkg/tarsum/tarsum_test.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package utils
1+
package tarsum
22

33
import (
44
"bytes"
Collapse file

‎…2e69206fc991fd5328c1a94d364ad00e457/json‎ ‎…2e69206fc991fd5328c1a94d364ad00e457/json‎utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json renamed to pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json renamed to pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json

Copy file name to clipboard
File renamed without changes.
Collapse file

‎…06fc991fd5328c1a94d364ad00e457/layer.tar‎ ‎…06fc991fd5328c1a94d364ad00e457/layer.tar‎utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar renamed to pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar utils/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar renamed to pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar

Copy file name to clipboard
File renamed without changes.
Collapse file

‎…aec563103b4d4702f3ba7d4d2698e22c158/json‎ ‎…aec563103b4d4702f3ba7d4d2698e22c158/json‎utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json renamed to pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json renamed to pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json

Copy file name to clipboard
File renamed without changes.
Collapse file

‎…3103b4d4702f3ba7d4d2698e22c158/layer.tar‎ ‎…3103b4d4702f3ba7d4d2698e22c158/layer.tar‎utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar renamed to pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar renamed to pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar

Copy file name to clipboard
File renamed without changes.
Collapse file

‎registry/registry.go‎

Copy file name to clipboardExpand all lines: registry/registry.go
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/docker/docker/dockerversion"
2828
"github.com/docker/docker/pkg/httputils"
2929
"github.com/docker/docker/pkg/parsers/kernel"
30+
"github.com/docker/docker/pkg/tarsum"
3031
"github.com/docker/docker/utils"
3132
)
3233

@@ -639,7 +640,7 @@ func (r *Registry) PushImageLayerRegistry(imgID string, layer io.Reader, registr
639640

640641
utils.Debugf("[registry] Calling PUT %s", registry+"images/"+imgID+"/layer")
641642

642-
tarsumLayer := &utils.TarSum{Reader: layer}
643+
tarsumLayer := &tarsum.TarSum{Reader: layer}
643644
h := sha256.New()
644645
h.Write(jsonRaw)
645646
h.Write([]byte{'\n'})

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.