diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index 9b22f9abe8..4ba02eeacb 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -1457,7 +1457,7 @@ NOTE: Docker will warn you if any containers exist that are using these untagged ## import - Usage: docker import URL|- [REPOSITORY[:TAG]] + Usage: docker import file|URL|- [REPOSITORY[:TAG]] Create an empty filesystem image and import the contents of the tarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then @@ -1465,10 +1465,14 @@ NOTE: Docker will warn you if any containers exist that are using these untagged -c, --change=[] Apply specified Dockerfile instructions while importing the image -URLs must start with `http` and point to a single file archive (.tar, -.tar.gz, .tgz, .bzip, .tar.xz, or .txz) containing a root filesystem. If -you would like to import from a local directory or archive, you can use -the `-` parameter to take the data from `STDIN`. +You can specify a `URL` or `-` (dash) to take data directly from `STDIN`. The +`URL` can point to an archive (.tar, .tar.gz, .tgz, .bzip, .tar.xz, or .txz) +containing a fileystem or to an individual file on the Docker host. If you +specify an archive, Docker untars it in the container relative to the `/` +(root). If you specify an individual file, you must specify the full path within +the host. To import from a remote location, specify a `URI` that begins with the +`http://` or `https://` protocol. + The `--change` option will apply `Dockerfile` instructions to the image that is created. @@ -1477,6 +1481,10 @@ Supported `Dockerfile` instructions: #### Examples +**Import from a local file archive:** + + $ sudo docker import /local/path/to/exampleimage.tgz exampleimagedir + **Import from a remote location:** This will create a new untagged image. diff --git a/man/docker-import.1.md b/man/docker-import.1.md index b45bf5d4c6..5ac686677b 100644 --- a/man/docker-import.1.md +++ b/man/docker-import.1.md @@ -8,7 +8,7 @@ docker-import - Create an empty filesystem image and import the contents of the **docker import** [**-c**|**--change**[= []**]] [**--help**] -URL|- [REPOSITORY[:TAG]] +file|URL|- [REPOSITORY[:TAG]] # OPTIONS **-c**, **--change**=[] @@ -35,6 +35,11 @@ Import to docker via pipe and stdin: # cat exampleimage.tgz | docker import - example/imagelocal +Import to a Docker image from a local file. + + # docker import /path/to/exampleimage.tgz + + ## Import from a local file and tag Import to docker via pipe and stdin: