Remove deprecated cli flags #17724

runcom · 2015-11-05T16:11:23Z

As per https://github.com/docker/docker/blob/master/docs/misc/deprecated.md#old-command-line-options

Signed-off-by: Antonio Murdaca runcom@redhat.com

duglin · 2015-11-05T16:16:54Z

nice clean-up!

runcom · 2015-11-05T16:19:26Z

I did want to take care of https://github.com/docker/docker/blob/master/docs/misc/deprecated.md#docker-content-trust-env-passphrase-variables-name-change as well but it's weird it was deprecated in 1.9 and target for removal is 1.10

thaJeztah · 2015-11-05T16:31:37Z

Darn! So had this on my to-do list, thought this would be an easy one for me to pick up, LOL

runcom · 2015-11-05T16:35:22Z

There are all the tests yet to be fixed if you want to carry this lol O:)

thaJeztah · 2015-11-05T16:39:01Z

hehe. no, feel free to take it! 😺
don't forget to update https://github.com/docker/docker/blob/master/docs/misc/deprecated.md as well, to make clear they have been removed in release 1.10

runcom · 2015-11-07T17:24:54Z

ping @duglin @calavera @cpuguy83

runcom · 2015-11-08T10:13:05Z

Windows fail seems related

runcom · 2015-11-08T10:25:19Z

ping @jhowardmsft I can't seem to find the issue with windows :/

lowenna · 2015-11-08T14:19:03Z

@runcom You need to kick it off again. See my IRc log from Friday evening. You've hit a common CI problem.

runcom · 2015-11-08T14:24:54Z

@jhowardmsft oh :( thanks for looking!

duglin · 2015-11-08T19:29:27Z

api/client/search.go

@@ -27,10 +27,9 @@ func (r ByStars) Less(i, j int) bool { return r[i].StarCount < r[j].StarCount }
 // Usage: docker search [OPTIONS] TERM
 func (cli *DockerCli) CmdSearch(args ...string) error {
 	cmd := Cli.Subcmd("search", []string{"TERM"}, Cli.DockerCommands["search"].Description, true)
-	noTrunc := cmd.Bool([]string{"#notrunc", "-no-trunc"}, false, "Don't truncate output")


was --no-trunc deprecated? I don't see it in the deprecated doc file.

it's in the file https://github.com/docker/docker/pull/17724/files#diff-9207f9a977bc11e99cfb49522dd26292R30 a line below

But was it listed in the deprecation docs? If not, and we still want to delete it anyway, then let's add it.

-notrunc was deprecated and I removed it
--no-trunc in docker search wasn't deprecated and I kept it in https://github.com/docker/docker/pull/17724/files#diff-9207f9a977bc11e99cfb49522dd26292R30

why do we want to delete even --no-trunc if it wasn't listed?

Oh sorry, I misread the above line - I thought you were removing it - I missed that its down below on line 30. I was used to seeing git-diff showing just the deleted words.

duglin · 2015-11-08T19:36:24Z

I might be misreading stuff, but the docs talk about --networking but the option is really --net. Could you include an update to the docs as part of this PR?

duglin · 2015-11-08T19:39:21Z

actually, I take that back. There is a --net and --networking (I think). Odd I don't see -networking on docker run --help though.

duglin · 2015-11-08T19:40:14Z

integration-cli/docker_cli_run_test.go

@@ -146,34 +146,6 @@ func (s *DockerSuite) TestRunWorkingDirectory(c *check.C) {
 	}
 }

-// pinging Google's DNS resolver should fail when we disable the networking
-func (s *DockerSuite) TestRunWithoutNetworking(c *check.C) {


I don't think -net is deprecated so I think this test is still valid, no?

I should remove from here https://github.com/docker/docker/pull/17724/files#diff-0189e098e6ba3aeffd9ee321ee6aca8aL168

I'm not following. Is --net/-n deprecated? I not then shouldn't this entire testcase be kept?

I'm a little concerned from the Windows side if --net=none is deprecated? What's the replacement? There will be other plumbing required in the Windows drivers if it is deprecated (along with this test)

For example: https://github.com/docker/docker/blob/master/daemon/container_windows.go#L62-L70

-n and --networking are deprecated, nothing to do with --net

The first part of the test is testing --net so it should be kept, the other -n -- I'll remove it

Ah, good :)

tiborvass · 2015-11-09T19:36:32Z

runconfig/parse.go

@@ -69,7 +69,6 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
 		flSecurityOpt       = opts.NewListOpts(nil)
 		flLabelsFile        = opts.NewListOpts(nil)
 		flLoggingOpts       = opts.NewListOpts(nil)
-		flNetwork           = cmd.Bool([]string{"#n", "#-networking"}, true, "Enable networking for this container")
 		flPrivileged        = cmd.Bool([]string{"#privileged", "-privileged"}, false, "Give extended privileges to this container")


forgot #privileged

Thanks tibor <3

tiborvass · 2015-11-09T19:37:39Z

needs rebase

runcom · 2015-11-09T19:48:23Z

@tiborvass updated & rebased

stevvooe · 2015-11-09T21:06:16Z

@runcom I'm just going to leave this here: http://stackoverflow.com/questions/9208091/the-difference-between-deprecated-depreciated-and-obsolete.

I'm assuming that we want to make these "obsolete", rather than "decrease their monetary value".

Please excuse my pedantry. :)

runcom · 2015-11-09T21:13:20Z

@stevvooe ahahah I even wrote the commit message right, excuse my typo as I'm an ESL actually :)

LK4D4 · 2015-11-13T23:11:45Z

Ok, gave up on windows.
LGTM

thaJeztah · 2015-11-14T23:48:29Z

@runcom sorry, needs a rebase :'(

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

calavera · 2015-11-17T15:39:59Z

LGTM

Remove depreciated cli flags

The old command line options have been deprecated in 1.8.0 and eventually removed in 1.10.0 through PR moby#17724, though the deprecated.md still shows `Target For Removal In Release`. This fix updates the deprecated.md and changes `Target For Removal In Release` to `Removed In Release`. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

GordonTheTurtle added the status/0-triage label Nov 5, 2015

runcom force-pushed the remove-depreciated-cli-flags branch from 577afbf to cfb1957 Compare November 5, 2015 17:24

runcom added status/2-code-review and removed status/0-triage labels Nov 5, 2015

runcom force-pushed the remove-depreciated-cli-flags branch 4 times, most recently from a85a059 to 514af47 Compare November 6, 2015 09:32

runcom force-pushed the remove-depreciated-cli-flags branch from 514af47 to f484eb9 Compare November 7, 2015 17:27

duglin reviewed Nov 8, 2015
View reviewed changes

runcom force-pushed the remove-depreciated-cli-flags branch from f484eb9 to 06a8511 Compare November 9, 2015 14:37

tiborvass reviewed Nov 9, 2015
View reviewed changes

runcom force-pushed the remove-depreciated-cli-flags branch from 06a8511 to 475e5a7 Compare November 9, 2015 19:48

Remove deprecated cli flags

7929888

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

runcom force-pushed the remove-depreciated-cli-flags branch from 475e5a7 to 7929888 Compare November 15, 2015 09:40

calavera added a commit that referenced this pull request Nov 17, 2015

Merge pull request #17724 from runcom/remove-depreciated-cli-flags

d507acb

Remove depreciated cli flags

calavera merged commit d507acb into moby:master Nov 17, 2015

runcom deleted the remove-depreciated-cli-flags branch November 17, 2015 16:42

thaJeztah added impact/changelog impact/cli impact/deprecation labels Nov 20, 2015

thaJeztah added this to the 1.10 milestone Nov 20, 2015

thaJeztah changed the title ~~Remove depreciated cli flags~~ Remove deprecated cli flags Nov 20, 2015

yongtang mentioned this pull request May 11, 2016

Update deprecated docs for cli flags removal. #22666

Merged

thaJeztah mentioned this pull request Dec 27, 2022

cli/command/container: remove unused NetworkDisabled field docker/cli#3935

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove deprecated cli flags #17724

Remove deprecated cli flags #17724

runcom commented Nov 5, 2015

duglin commented Nov 5, 2015

runcom commented Nov 5, 2015

thaJeztah commented Nov 5, 2015

runcom commented Nov 5, 2015

thaJeztah commented Nov 5, 2015

runcom commented Nov 7, 2015

runcom commented Nov 8, 2015

runcom commented Nov 8, 2015

lowenna commented Nov 8, 2015

runcom commented Nov 8, 2015

duglin Nov 8, 2015

runcom Nov 8, 2015

duglin Nov 8, 2015

runcom Nov 8, 2015

duglin Nov 8, 2015

duglin commented Nov 8, 2015

duglin commented Nov 8, 2015

duglin Nov 8, 2015

runcom Nov 8, 2015

duglin Nov 8, 2015

lowenna Nov 9, 2015

lowenna Nov 9, 2015

runcom Nov 9, 2015

lowenna Nov 9, 2015

tiborvass Nov 9, 2015

runcom Nov 9, 2015

tiborvass commented Nov 9, 2015

runcom commented Nov 9, 2015

stevvooe commented Nov 9, 2015

runcom commented Nov 9, 2015

LK4D4 commented Nov 13, 2015

thaJeztah commented Nov 14, 2015

calavera commented Nov 17, 2015

Remove deprecated cli flags #17724

Remove deprecated cli flags #17724

Conversation

runcom commented Nov 5, 2015

duglin commented Nov 5, 2015

runcom commented Nov 5, 2015

thaJeztah commented Nov 5, 2015

runcom commented Nov 5, 2015

thaJeztah commented Nov 5, 2015

runcom commented Nov 7, 2015

runcom commented Nov 8, 2015

runcom commented Nov 8, 2015

lowenna commented Nov 8, 2015

runcom commented Nov 8, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

duglin commented Nov 8, 2015

duglin commented Nov 8, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tiborvass commented Nov 9, 2015

runcom commented Nov 9, 2015

stevvooe commented Nov 9, 2015

runcom commented Nov 9, 2015

LK4D4 commented Nov 13, 2015

thaJeztah commented Nov 14, 2015

calavera commented Nov 17, 2015