Skip to content

Commit 4352da7

Browse files
tonistiigiAaron Lehmann
tonistiigi
authored and
Aaron Lehmann
committed
Update daemon and docker core to use new content addressable storage
Add distribution package for managing pulls and pushes. This is based on the old code in the graph package, with major changes to work with the new image/layer model. Add v1 migration code. Update registry, api/*, and daemon packages to use the reference package's types where applicable. Update daemon package to use image/layer/tag stores instead of the graph package Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
1 parent 5fc0e1f commit 4352da7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2026
-1271
lines changed

‎api/client/build.go‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ import (
1818
"strconv"
1919
"strings"
2020

21+
"github.com/docker/distribution/reference"
2122
"github.com/docker/docker/api"
2223
Cli "github.com/docker/docker/cli"
23-
"github.com/docker/docker/graph/tags"
2424
"github.com/docker/docker/opts"
2525
"github.com/docker/docker/pkg/archive"
2626
"github.com/docker/docker/pkg/fileutils"
2727
"github.com/docker/docker/pkg/httputils"
2828
"github.com/docker/docker/pkg/jsonmessage"
2929
flag "github.com/docker/docker/pkg/mflag"
30-
"github.com/docker/docker/pkg/parsers"
3130
"github.com/docker/docker/pkg/progressreader"
3231
"github.com/docker/docker/pkg/streamformatter"
3332
"github.com/docker/docker/pkg/ulimit"
3433
"github.com/docker/docker/pkg/units"
3534
"github.com/docker/docker/pkg/urlutil"
3635
"github.com/docker/docker/registry"
3736
"github.com/docker/docker/runconfig"
37+
tagpkg "github.com/docker/docker/tag"
3838
"github.com/docker/docker/utils"
3939
)
4040

@@ -323,7 +323,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
323323
// Since the build was successful, now we must tag any of the resolved
324324
// images from the above Dockerfile rewrite.
325325
for _, resolved := range resolvedTags {
326-
if err := cli.tagTrusted(resolved.repoInfo, resolved.digestRef, resolved.tagRef); err != nil {
326+
if err := cli.tagTrusted(resolved.digestRef, resolved.tagRef); err != nil {
327327
return err
328328
}
329329
}
@@ -333,16 +333,12 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
333333

334334
// validateTag checks if the given image name can be resolved.
335335
func validateTag(rawRepo string) (string, error) {
336-
repository, tag := parsers.ParseRepositoryTag(rawRepo)
337-
if err := registry.ValidateRepositoryName(repository); err != nil {
336+
ref, err := reference.ParseNamed(rawRepo)
337+
if err != nil {
338338
return "", err
339339
}
340340

341-
if len(tag) == 0 {
342-
return rawRepo, nil
343-
}
344-
345-
if err := tags.ValidateTagName(tag); err != nil {
341+
if err := registry.ValidateRepositoryName(ref); err != nil {
346342
return "", err
347343
}
348344

@@ -565,15 +561,16 @@ func (td *trustedDockerfile) Close() error {
565561
// resolvedTag records the repository, tag, and resolved digest reference
566562
// from a Dockerfile rewrite.
567563
type resolvedTag struct {
568-
repoInfo *registry.RepositoryInfo
569-
digestRef, tagRef registry.Reference
564+
repoInfo *registry.RepositoryInfo
565+
digestRef reference.Canonical
566+
tagRef reference.NamedTagged
570567
}
571568

572569
// rewriteDockerfileFrom rewrites the given Dockerfile by resolving images in
573570
// "FROM <image>" instructions to a digest reference. `translator` is a
574571
// function that takes a repository name and tag reference and returns a
575572
// trusted digest reference.
576-
func rewriteDockerfileFrom(dockerfileName string, translator func(string, registry.Reference) (registry.Reference, error)) (newDockerfile *trustedDockerfile, resolvedTags []*resolvedTag, err error) {
573+
func rewriteDockerfileFrom(dockerfileName string, translator func(reference.NamedTagged) (reference.Canonical, error)) (newDockerfile *trustedDockerfile, resolvedTags []*resolvedTag, err error) {
577574
dockerfile, err := os.Open(dockerfileName)
578575
if err != nil {
579576
return nil, nil, fmt.Errorf("unable to open Dockerfile: %v", err)
@@ -607,29 +604,39 @@ func rewriteDockerfileFrom(dockerfileName string, translator func(string, regist
607604
matches := dockerfileFromLinePattern.FindStringSubmatch(line)
608605
if matches != nil && matches[1] != "scratch" {
609606
// Replace the line with a resolved "FROM repo@digest"
610-
repo, tag := parsers.ParseRepositoryTag(matches[1])
611-
if tag == "" {
612-
tag = tags.DefaultTag
607+
ref, err := reference.ParseNamed(matches[1])
608+
if err != nil {
609+
return nil, nil, err
613610
}
614611

615-
repoInfo, err := registry.ParseRepositoryInfo(repo)
616-
if err != nil {
617-
return nil, nil, fmt.Errorf("unable to parse repository info %q: %v", repo, err)
612+
digested := false
613+
switch ref.(type) {
614+
case reference.Tagged:
615+
case reference.Digested:
616+
digested = true
617+
default:
618+
ref, err = reference.WithTag(ref, tagpkg.DefaultTag)
619+
if err != nil {
620+
return nil, nil, err
621+
}
618622
}
619623

620-
ref := registry.ParseReference(tag)
624+
repoInfo, err := registry.ParseRepositoryInfo(ref)
625+
if err != nil {
626+
return nil, nil, fmt.Errorf("unable to parse repository info %q: %v", ref.String(), err)
627+
}
621628

622-
if !ref.HasDigest() && isTrusted() {
623-
trustedRef, err := translator(repo, ref)
629+
if !digested && isTrusted() {
630+
trustedRef, err := translator(ref.(reference.NamedTagged))
624631
if err != nil {
625632
return nil, nil, err
626633
}
627634

628-
line = dockerfileFromLinePattern.ReplaceAllLiteralString(line, fmt.Sprintf("FROM %s", trustedRef.ImageName(repo)))
635+
line = dockerfileFromLinePattern.ReplaceAllLiteralString(line, fmt.Sprintf("FROM %s", trustedRef.String()))
629636
resolvedTags = append(resolvedTags, &resolvedTag{
630637
repoInfo: repoInfo,
631638
digestRef: trustedRef,
632-
tagRef: ref,
639+
tagRef: ref.(reference.NamedTagged),
633640
})
634641
}
635642
}

‎api/client/commit.go‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ package client
22

33
import (
44
"encoding/json"
5+
"errors"
56
"fmt"
67
"net/url"
78

9+
"github.com/docker/distribution/reference"
810
"github.com/docker/docker/api/types"
911
Cli "github.com/docker/docker/cli"
1012
"github.com/docker/docker/opts"
1113
flag "github.com/docker/docker/pkg/mflag"
12-
"github.com/docker/docker/pkg/parsers"
1314
"github.com/docker/docker/registry"
1415
"github.com/docker/docker/runconfig"
1516
)
@@ -32,20 +33,35 @@ func (cli *DockerCli) CmdCommit(args ...string) error {
3233
cmd.ParseFlags(args, true)
3334

3435
var (
35-
name = cmd.Arg(0)
36-
repository, tag = parsers.ParseRepositoryTag(cmd.Arg(1))
36+
name = cmd.Arg(0)
37+
repositoryAndTag = cmd.Arg(1)
38+
repositoryName string
39+
tag string
3740
)
3841

3942
//Check if the given image name can be resolved
40-
if repository != "" {
41-
if err := registry.ValidateRepositoryName(repository); err != nil {
43+
if repositoryAndTag != "" {
44+
ref, err := reference.ParseNamed(repositoryAndTag)
45+
if err != nil {
4246
return err
4347
}
48+
if err := registry.ValidateRepositoryName(ref); err != nil {
49+
return err
50+
}
51+
52+
repositoryName = ref.Name()
53+
54+
switch x := ref.(type) {
55+
case reference.Digested:
56+
return errors.New("cannot commit to digest reference")
57+
case reference.Tagged:
58+
tag = x.Tag()
59+
}
4460
}
4561

4662
v := url.Values{}
4763
v.Set("container", name)
48-
v.Set("repo", repository)
64+
v.Set("repo", repositoryName)
4965
v.Set("tag", tag)
5066
v.Set("comment", *flComment)
5167
v.Set("author", *flAuthor)

‎api/client/create.go‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"os"
1010
"strings"
1111

12+
"github.com/docker/distribution/reference"
1213
"github.com/docker/docker/api/types"
1314
Cli "github.com/docker/docker/cli"
14-
"github.com/docker/docker/graph/tags"
15-
"github.com/docker/docker/pkg/parsers"
1615
"github.com/docker/docker/registry"
1716
"github.com/docker/docker/runconfig"
17+
tagpkg "github.com/docker/docker/tag"
1818
)
1919

2020
func (cli *DockerCli) pullImage(image string) error {
@@ -23,16 +23,28 @@ func (cli *DockerCli) pullImage(image string) error {
2323

2424
func (cli *DockerCli) pullImageCustomOut(image string, out io.Writer) error {
2525
v := url.Values{}
26-
repos, tag := parsers.ParseRepositoryTag(image)
27-
// pull only the image tagged 'latest' if no tag was specified
28-
if tag == "" {
29-
tag = tags.DefaultTag
26+
27+
ref, err := reference.ParseNamed(image)
28+
if err != nil {
29+
return err
30+
}
31+
32+
var tag string
33+
switch x := ref.(type) {
34+
case reference.Digested:
35+
tag = x.Digest().String()
36+
case reference.Tagged:
37+
tag = x.Tag()
38+
default:
39+
// pull only the image tagged 'latest' if no tag was specified
40+
tag = tagpkg.DefaultTag
3041
}
31-
v.Set("fromImage", repos)
42+
43+
v.Set("fromImage", ref.Name())
3244
v.Set("tag", tag)
3345

3446
// Resolve the Repository name from fqn to RepositoryInfo
35-
repoInfo, err := registry.ParseRepositoryInfo(repos)
47+
repoInfo, err := registry.ParseRepositoryInfo(ref)
3648
if err != nil {
3749
return err
3850
}
@@ -94,39 +106,46 @@ func (cli *DockerCli) createContainer(config *runconfig.Config, hostConfig *runc
94106
defer containerIDFile.Close()
95107
}
96108

97-
repo, tag := parsers.ParseRepositoryTag(config.Image)
98-
if tag == "" {
99-
tag = tags.DefaultTag
109+
ref, err := reference.ParseNamed(config.Image)
110+
if err != nil {
111+
return nil, err
100112
}
101113

102-
ref := registry.ParseReference(tag)
103-
var trustedRef registry.Reference
114+
isDigested := false
115+
switch ref.(type) {
116+
case reference.Tagged:
117+
case reference.Digested:
118+
isDigested = true
119+
default:
120+
ref, err = reference.WithTag(ref, tagpkg.DefaultTag)
121+
if err != nil {
122+
return nil, err
123+
}
124+
}
104125

105-
if isTrusted() && !ref.HasDigest() {
126+
var trustedRef reference.Canonical
127+
128+
if isTrusted() && !isDigested {
106129
var err error
107-
trustedRef, err = cli.trustedReference(repo, ref)
130+
trustedRef, err = cli.trustedReference(ref.(reference.NamedTagged))
108131
if err != nil {
109132
return nil, err
110133
}
111-
config.Image = trustedRef.ImageName(repo)
134+
config.Image = trustedRef.String()
112135
}
113136

114137
//create the container
115138
serverResp, err := cli.call("POST", "/containers/create?"+containerValues.Encode(), mergedConfig, nil)
116139
//if image not found try to pull it
117140
if serverResp.statusCode == 404 && strings.Contains(err.Error(), config.Image) {
118-
fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.ImageName(repo))
141+
fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.String())
119142

120143
// we don't want to write to stdout anything apart from container.ID
121144
if err = cli.pullImageCustomOut(config.Image, cli.err); err != nil {
122145
return nil, err
123146
}
124-
if trustedRef != nil && !ref.HasDigest() {
125-
repoInfo, err := registry.ParseRepositoryInfo(repo)
126-
if err != nil {
127-
return nil, err
128-
}
129-
if err := cli.tagTrusted(repoInfo, trustedRef, ref); err != nil {
147+
if trustedRef != nil && !isDigested {
148+
if err := cli.tagTrusted(trustedRef, ref.(reference.NamedTagged)); err != nil {
130149
return nil, err
131150
}
132151
}

‎api/client/images.go‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import (
44
"encoding/json"
55
"fmt"
66
"net/url"
7+
"strings"
78
"text/tabwriter"
89
"time"
910

11+
"github.com/docker/distribution/reference"
1012
"github.com/docker/docker/api/types"
1113
Cli "github.com/docker/docker/cli"
1214
"github.com/docker/docker/opts"
1315
flag "github.com/docker/docker/pkg/mflag"
14-
"github.com/docker/docker/pkg/parsers"
1516
"github.com/docker/docker/pkg/parsers/filters"
1617
"github.com/docker/docker/pkg/stringid"
1718
"github.com/docker/docker/pkg/units"
18-
"github.com/docker/docker/utils"
1919
)
2020

2121
// CmdImages lists the images in a specified repository, or all top-level images if no repository is specified.
@@ -78,9 +78,9 @@ func (cli *DockerCli) CmdImages(args ...string) error {
7878
w := tabwriter.NewWriter(cli.out, 20, 1, 3, ' ', 0)
7979
if !*quiet {
8080
if *showDigests {
81-
fmt.Fprintln(w, "REPOSITORY\tTAG\tDIGEST\tIMAGE ID\tCREATED\tVIRTUAL SIZE")
81+
fmt.Fprintln(w, "REPOSITORY\tTAG\tDIGEST\tIMAGE ID\tCREATED\tSIZE")
8282
} else {
83-
fmt.Fprintln(w, "REPOSITORY\tTAG\tIMAGE ID\tCREATED\tVIRTUAL SIZE")
83+
fmt.Fprintln(w, "REPOSITORY\tTAG\tIMAGE ID\tCREATED\tSIZE")
8484
}
8585
}
8686

@@ -101,21 +101,31 @@ func (cli *DockerCli) CmdImages(args ...string) error {
101101
// combine the tags and digests lists
102102
tagsAndDigests := append(repoTags, repoDigests...)
103103
for _, repoAndRef := range tagsAndDigests {
104-
repo, ref := parsers.ParseRepositoryTag(repoAndRef)
105-
// default tag and digest to none - if there's a value, it'll be set below
104+
// default repo, tag, and digest to none - if there's a value, it'll be set below
105+
repo := "<none>"
106106
tag := "<none>"
107107
digest := "<none>"
108-
if utils.DigestReference(ref) {
109-
digest = ref
110-
} else {
111-
tag = ref
108+
109+
if !strings.HasPrefix(repoAndRef, "<none>") {
110+
ref, err := reference.ParseNamed(repoAndRef)
111+
if err != nil {
112+
return err
113+
}
114+
repo = ref.Name()
115+
116+
switch x := ref.(type) {
117+
case reference.Digested:
118+
digest = x.Digest().String()
119+
case reference.Tagged:
120+
tag = x.Tag()
121+
}
112122
}
113123

114124
if !*quiet {
115125
if *showDigests {
116-
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s ago\t%s\n", repo, tag, digest, ID, units.HumanDuration(time.Now().UTC().Sub(time.Unix(int64(image.Created), 0))), units.HumanSize(float64(image.VirtualSize)))
126+
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s ago\t%s\n", repo, tag, digest, ID, units.HumanDuration(time.Now().UTC().Sub(time.Unix(int64(image.Created), 0))), units.HumanSize(float64(image.Size)))
117127
} else {
118-
fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\n", repo, tag, ID, units.HumanDuration(time.Now().UTC().Sub(time.Unix(int64(image.Created), 0))), units.HumanSize(float64(image.VirtualSize)))
128+
fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\n", repo, tag, ID, units.HumanDuration(time.Now().UTC().Sub(time.Unix(int64(image.Created), 0))), units.HumanSize(float64(image.Size)))
119129
}
120130
} else {
121131
fmt.Fprintln(w, ID)

‎api/client/import.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"net/url"
77
"os"
88

9+
"github.com/docker/distribution/reference"
910
Cli "github.com/docker/docker/cli"
1011
"github.com/docker/docker/opts"
1112
flag "github.com/docker/docker/pkg/mflag"
12-
"github.com/docker/docker/pkg/parsers"
1313
"github.com/docker/docker/pkg/urlutil"
1414
"github.com/docker/docker/registry"
1515
)
@@ -47,8 +47,11 @@ func (cli *DockerCli) CmdImport(args ...string) error {
4747

4848
if repository != "" {
4949
//Check if the given image name can be resolved
50-
repo, _ := parsers.ParseRepositoryTag(repository)
51-
if err := registry.ValidateRepositoryName(repo); err != nil {
50+
ref, err := reference.ParseNamed(repository)
51+
if err != nil {
52+
return err
53+
}
54+
if err := registry.ValidateRepositoryName(ref); err != nil {
5255
return err
5356
}
5457
}

0 commit comments

Comments
 (0)