github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

linuxkit: Use docker image «foo» consistently

Browse Source 
In preference to the `docker «foo»` shortcut/aliases.

Better to be more specific.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-12-04 10:29:28 +00:00
parent 8eed6a4b38
commit 98d46945d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/linuxkit/pkglib/docker.go
View File

@ -53,7 +53,7 @@ func (dr dockerRunner) command(args ...string) error {
} }
func (dr dockerRunner) pull(img string) (bool, error) { func (dr dockerRunner) pull(img string) (bool, error) {
err := dr.command("pull", img) err := dr.command("image", "pull", img)
if err == nil { if err == nil {
return true, nil return true, nil
} }
@ -66,7 +66,7 @@ func (dr dockerRunner) pull(img string) (bool, error) {
} }
func (dr dockerRunner) push(img string) error { func (dr dockerRunner) push(img string) error {
return dr.command("push", img) return dr.command("image", "push", img)
} }
func (dr dockerRunner) pushWithManifest(img, suffix string) error { func (dr dockerRunner) pushWithManifest(img, suffix string) error {
@ -91,7 +91,7 @@ func (dr dockerRunner) pushWithManifest(img, suffix string) error {
func (dr dockerRunner) tag(ref, tag string) error { func (dr dockerRunner) tag(ref, tag string) error {
fmt.Printf("Tagging %s as %s\n", ref, tag) fmt.Printf("Tagging %s as %s\n", ref, tag)
return dr.command("tag", ref, tag) return dr.command("image", "tag", ref, tag)
} }
func (dr dockerRunner) build(tag, pkg string, opts ...string) error { func (dr dockerRunner) build(tag, pkg string, opts ...string) error {