kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Deprecated the old 3-args form of docker import

Browse source 
It's been deprecated since November 2013 and v0.6.7. Removing the cli
side of it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2016-06-05 18:07:34 +02:00
parent 0f13b69fe2
commit 372063ce1b
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/client/import.go
View file

@ -1,7 +1,6 @@
package client package client
import ( import (
"fmt"
"io" "io"
"os" "os"
@ -31,19 +30,12 @@ func (cli *DockerCli) CmdImport(args ...string) error {
var ( var (
in io.Reader in io.Reader
tag string
src = cmd.Arg(0) src = cmd.Arg(0)
srcName = src srcName = src
ref = cmd.Arg(1) ref = cmd.Arg(1)
changes = flChanges.GetAll() changes = flChanges.GetAll()
) )
if cmd.NArg() == 3 {
// FIXME(vdemeester) Which version has this been deprecated ? should we remove it ?
fmt.Fprintf(cli.err, "[DEPRECATED] The format 'file|URL|- [REPOSITORY [TAG]]' has been deprecated. Please use file|URL|- [REPOSITORY[:TAG]]\n")
tag = cmd.Arg(2)
}
if src == "-" { if src == "-" {
in = cli.in in = cli.in
} else if !urlutil.IsURL(src) { } else if !urlutil.IsURL(src) {
@ -63,7 +55,6 @@ func (cli *DockerCli) CmdImport(args ...string) error {
options := types.ImageImportOptions{ options := types.ImageImportOptions{
Message: *message, Message: *message,
Tag: tag,
Changes: changes, Changes: changes,
} }

7
docs/deprecated.md
View file

@ -14,6 +14,13 @@ weight=80
The following list of features are deprecated in Engine. The following list of features are deprecated in Engine.
### Three argument form in `docker import`
**Deprecated In Release: [v0.6.7](https://github.com/docker/docker/releases/tag/v0.6.7)**
**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
The `docker import` command format 'file|URL|- [REPOSITORY [TAG]]' is deprecated since November 2013. It's no more supported.
### `-e` and `--email` flags on `docker login` ### `-e` and `--email` flags on `docker login`
**Deprecated In Release: [v1.11.0](https://github.com/docker/docker/releases/tag/v1.11.0)** **Deprecated In Release: [v1.11.0](https://github.com/docker/docker/releases/tag/v1.11.0)**