From 40052b6ec60602d7a9e0fb7a4267de1db0221e8e Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Thu, 9 Nov 2017 11:31:45 -0800 Subject: [PATCH 1/3] Document EXPOSE UDP syntax Signed-off-by: Misty Stanley-Jones Upstream-commit: db572ec4abf1661a7d9849c7b4fd4f310c9cfa6e Component: cli --- components/cli/docs/reference/builder.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/components/cli/docs/reference/builder.md b/components/cli/docs/reference/builder.md index 4da646370d..217d2eada0 100644 --- a/components/cli/docs/reference/builder.md +++ b/components/cli/docs/reference/builder.md @@ -767,6 +767,30 @@ publish the port when running the container, use the `-p` flag on `docker run` to publish and map one or more ports, or the `-P` flag to publish all exposed ports and map them to high-order ports. +By default, `EXPOSE` assumes TCP. You can also specify UDP: + +```Dockerfile +EXPOSE 80/udp +``` + +To expose on both TCP and UDP, include two lines: + +```Dockerfile +EXPOSE 80/tcp +EXPOSE 80/udp +``` + +In this case, if you use `-P` with `docker run`, the port will be exposed once +for TCP and once for UDP. Remember that `-P` uses an ephemeral high-ordered host +port on the host, so the port will not be the same for TCP and UDP. + +Regardless of the `EXPOSE` settings, you can override them at runtime by using +the `-p` flag. For example + +```bash +docker run -p 80:80/tcp -p 80:80/udp ... +``` + To set up port redirection on the host system, see [using the -P flag](run.md#expose-incoming-ports). The `docker network` command supports creating networks for communication among containers without the need to From 1bed718e52d31b0703cab6bb50722657030e55c3 Mon Sep 17 00:00:00 2001 From: Michael Friis Date: Thu, 4 Jan 2018 13:17:56 -0800 Subject: [PATCH 2/3] use 'config' over 'configuration file' Signed-off-by: Michael Friis Upstream-commit: 99e3b4cd93e8e87f82dbcf04a5635a69b36697d9 Component: cli --- components/cli/cli/command/config/create.go | 2 +- components/cli/cli/command/config/inspect.go | 2 +- components/cli/cli/command/config/remove.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/cli/cli/command/config/create.go b/components/cli/cli/command/config/create.go index 437137c160..20a33059a7 100644 --- a/components/cli/cli/command/config/create.go +++ b/components/cli/cli/command/config/create.go @@ -28,7 +28,7 @@ func newConfigCreateCommand(dockerCli command.Cli) *cobra.Command { cmd := &cobra.Command{ Use: "create [OPTIONS] CONFIG file|-", - Short: "Create a configuration file from a file or STDIN as content", + Short: "Create a config from a file or STDIN", Args: cli.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { createOpts.name = args[0] diff --git a/components/cli/cli/command/config/inspect.go b/components/cli/cli/command/config/inspect.go index d7a3422a71..6976e5a079 100644 --- a/components/cli/cli/command/config/inspect.go +++ b/components/cli/cli/command/config/inspect.go @@ -21,7 +21,7 @@ func newConfigInspectCommand(dockerCli command.Cli) *cobra.Command { opts := inspectOptions{} cmd := &cobra.Command{ Use: "inspect [OPTIONS] CONFIG [CONFIG...]", - Short: "Display detailed information on one or more configuration files", + Short: "Display detailed information on one or more configs", Args: cli.RequiresMinArgs(1), RunE: func(cmd *cobra.Command, args []string) error { opts.names = args diff --git a/components/cli/cli/command/config/remove.go b/components/cli/cli/command/config/remove.go index 5512986d90..c8eac11af1 100644 --- a/components/cli/cli/command/config/remove.go +++ b/components/cli/cli/command/config/remove.go @@ -19,7 +19,7 @@ func newConfigRemoveCommand(dockerCli command.Cli) *cobra.Command { return &cobra.Command{ Use: "rm CONFIG [CONFIG...]", Aliases: []string{"remove"}, - Short: "Remove one or more configuration files", + Short: "Remove one or more configs", Args: cli.RequiresMinArgs(1), RunE: func(cmd *cobra.Command, args []string) error { opts := removeOptions{ From d0f281be92a49d804633a49aa43be9d061149169 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Fri, 5 Jan 2018 13:49:16 -0800 Subject: [PATCH 3/3] docker load supports tar and tar.gz files Signed-off-by: Misty Stanley-Jones Upstream-commit: ac7a5650f057fd039950e5cd4d4d32582cb5a2c8 Component: cli --- components/cli/docs/reference/commandline/load.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/cli/docs/reference/commandline/load.md b/components/cli/docs/reference/commandline/load.md index 78d73adfee..1c1d57f4fb 100644 --- a/components/cli/docs/reference/commandline/load.md +++ b/components/cli/docs/reference/commandline/load.md @@ -18,7 +18,8 @@ keywords: "stdin, tarred, repository" ```markdown Usage: docker load [OPTIONS] -Load an image from a tar archive or STDIN +Load an image or repository from a tar archive (even if compressed with gzip, +bzip2, or xz) from a file or STDIN. Options: --help Print usage @@ -28,13 +29,13 @@ Options: ``` ## Description -`docker load` loads a tarred repository from a file or the standard input stream. -It restores both images and tags. +Load an image or repository from a tar archive (even if compressed with gzip, +bzip2, or xz) from a file or STDIN. It restores both images and tags. ## Examples ```bash -$ docker images +$ docker docker image ls REPOSITORY TAG IMAGE ID CREATED SIZE