Commit Graph

424 Commits

Author SHA1 Message Date
abfdc34927 Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere
Consistently use 'sudo docker' in examples
Upstream-commit: b64558907139911b86d846de70ab859504cc45a2
Component: engine
2014-09-16 08:43:58 -04:00
0fd379bbda Added missing 't' from the end of the /images/{{id}}/get eg.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 4352ea7b0a746f00c29fb1170e893242cb8612ef
Component: engine
2014-09-16 15:27:44 +10:00
cd4d60a084 Consistently use 'sudo docker' in examples
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
2014-09-16 11:49:05 +10:00
1bc2448cc5 Merge pull request #8037 from unclejack/shrink_docs_images
docs: shrink images
Upstream-commit: 62b86613e8c6bb8fa1c50fd30a92c050ffbed88e
Component: engine
2014-09-16 10:13:03 +10:00
084a5b1c3f Change the copy command Content-Type header to x-tar
Addresses #6107

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 788e4acaa3883bc7369f9462f107266b41c59746
Component: engine
2014-09-15 10:45:06 -07:00
c3fe53e47f docs: shrink images
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 90dcc7c8405437a10b81e932b49a856502cee626
Component: engine
2014-09-15 14:46:29 +03:00
5d83fcb509 HTTP Status 201 not 200
The http status should be 201 not 200.

Docker-DCO-1.1-Signed-off-by: Erik Kristensen <erik@erikkristensen.com> (github: SvenDowideit)
Upstream-commit: c4db3b8075ab4b8bd0c6599cb19e09eb77c82946
Component: engine
2014-09-15 10:58:45 +10:00
0e0922f67a Merge pull request #7986 from abh1nav/master
Update remote_api_client_libraries.md
Upstream-commit: 64ecef59af2d5befd5624f3eb73e9ff16d827c55
Component: engine
2014-09-12 10:37:00 -07:00
9a7a429b7a Merge pull request #7987 from SvenDowideit/stop-hurting-blackrosezys-eyes
Yep, its been hurting my eyes too - and you've finally inspired me to fi...
Upstream-commit: 1501adad29bee6ebb40589a08b6374374d7c3fbf
Component: engine
2014-09-12 10:35:30 -07:00
990ce2ca68 docs/reference/api: fix typo in docs
Signed-off-by: Francisco Souza <f@souza.cc>
Upstream-commit: fe5b72e7bb4f7c043409196cb98d46796f2dc390
Component: engine
2014-09-12 13:57:43 -03:00
92ab71ec69 Merge pull request #7998 from duglin/Issue5701
Add notes about single-quotes (for issue 5701)
Upstream-commit: b6b85a58fd0455f2655219706e6061a5847b21b7
Component: engine
2014-09-12 07:41:31 -04:00
f8e23ee9a1 Override prettyPrint's colour choice (red) for strings in quotes.
I've moved the docs.css to last so it can tweak any existing css, and
then set that to the same grey colour used for 'normal' text.

While testing I found and fixed an over-zealous line wrap.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: df8dbfa45dee108c6bb002f49a5f36e7d911616d
Component: engine
2014-09-12 11:10:07 +10:00
5948eafc31 Merge pull request #7991 from laktek/master
Fixed a typo in docs (outpu -> output).
Upstream-commit: c0783dfcebfd78b5798a7ea104162bb38180c265
Component: engine
2014-09-12 10:40:16 +10:00
17af1eaec1 Add notes about single-quotes
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b47a2fbdc545d649a945e78a22da0c5dd9df0921
Component: engine
2014-09-11 10:19:07 -07:00
9153ab8851 Fixed a typo in docs (outpu -> output).
Signed-off-by: Lakshan Perera <lakshan@laktek.com>
Upstream-commit: 7b1fdd6c0460931d458703e175cba157de9b0246
Component: engine
2014-09-11 09:09:59 +00:00
066f8a742f Update remote_api_client_libraries.md
Adding docker rust client lib.

Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com>
Upstream-commit: c7310b64637ae29a6d7a07b7e533a546e3524654
Component: engine
2014-09-11 03:04:35 -04:00
0b07be83cc Add daemon flag to specify public registry mirrors
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.

Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)
Upstream-commit: 69a75c673ccf0aebf19c7b350243f1b0cefad8be
Component: engine
2014-09-09 19:03:38 +00:00
791c25051e Merge pull request #7948 from SvenDowideit/add-more-port-specification-doc
add -p PORT as a valid format specification
Upstream-commit: 2a832f617bb7db65aa083d73f650cb1ad756da1a
Component: engine
2014-09-09 11:43:25 -07:00
ec6681e63c Reformat the API docs so I can read them
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: f36dfbdcaf54ed01721f0871c26fe041c7c6bac0
Component: engine
2014-09-09 16:17:38 +10:00
4e3172a877 add -p PORT as a valid format specification
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: e4d2a8231a53794c2b5b28ccf63125a85749e648
Component: engine
2014-09-09 11:16:02 +10:00
5d6a00955d Merge pull request #7931 from jamtur01/device
Added --device flag to run reference
Upstream-commit: bb8ea1fdc1c5c3e1b90c15b451ab22334c86e70c
Component: engine
2014-09-08 14:33:56 -07:00
b5848ae179 Merge pull request #7929 from SvenDowideit/doc-tar-stream
Sven Dowideit 	Update export, copy and build API to say 'TAR STREAM' for all versions.
Upstream-commit: 10e4ca760ca1d1145169dbff94e0c8414928b79c
Component: engine
2014-09-08 14:27:45 -07:00
ca58c61a83 Merge pull request #7759 from unclejack/pull_latest_by_default
make docker pull only the latest tag by default
Upstream-commit: 85314e7e58a17cf3ebc4b29511b3399cd758b1ae
Component: engine
2014-09-08 13:43:21 -07:00
b754dfbfae add C# docker client library link
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: cde53c51b575d0cdeb01fc3428877ab63165e8b0
Component: engine
2014-09-07 23:29:04 -07:00
a6318245ce Added --device flag to run reference
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 9e34c42d20ef95225bb6c36235d22935365cbef9
Component: engine
2014-09-07 23:17:14 -04:00
30cb064720 Update export, copy and build API to sat 'TAR STREAM' for all versions.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 77fa306d63f0c0e48f49f6679beeb1ea55673f2a
Component: engine
2014-09-08 11:54:21 +10:00
816f39672a Update docker_remote_api_v1.14.md
It is a tar stream, you should mention that somehow.

Here is the proof:

```
	host:~$ docker run -t -i ubuntu:14.04 bash
	root@c39be4c7b7c8:/# echo "my file contents" > abc
	root@c39be4c7b7c8:/# cat abc
	my file contents
	root@c39be4c7b7c8:/# exit
	host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy
	abc0100644000000000000000000000002112402102531007674 0ustar0000000000000000my file contents
	host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy > response_content
	  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
	                                 Dload  Upload   Total   Spent    Left  Speed
	100  2067  100  2048  100    19  56968    528 --:--:-- --:--:-- --:--:-- 58514
	host:~$ tar xvf response_content
	abc
	host:~$ cat abc
	my file contents
```

Docker-DCO-1.1-Signed-off-by: Mustafa Akın <mustafa91@gmail.com> (github: SvenDowideit)
Upstream-commit: b9e889c30988f3babbc059a883d7f3096611ad60
Component: engine
2014-09-08 11:52:27 +10:00
6a9927c181 add a little documentation for docker pull
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 82b0c3e59ca12dd87bf2a9d88a63ff66e7d29fb4
Component: engine
2014-09-03 18:32:41 +03:00
e5f24c4f6a more updates
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2d8695761d0241d2c9b8bfe4274674c702c6a14d
Component: engine
2014-09-01 18:41:42 +00:00
3d35a8c726 v1.13 and 1.14 api docs now match runconfig/config.go
Upstream-commit: eac6a5d78906a70ddc3264f8d0a87369aefaedf0
Component: engine
2014-09-01 18:33:13 +00:00
6c5eee34ef List all ports when calling docker port container
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 4e340cedeccabcae8875dd35f8c984246d6c3bc1
Component: engine
2014-08-29 18:31:51 +10:00
4d890308d7 docker save: ability to save multiple images
Now from a single invocation of `docker save`, you can specify multiple
images to include in the output tar, or even just multiple tags of a
particular image/repo.

```
> docker save -o bundle.tar busybox ubuntu:lucid ubuntu:saucy fedora:latest
> tar tf ./bundle.tar | wc -l
42
> tar xOf ./bundle.tar repositories
{"busybox":{"latest":"2d8e5b282c81244037eb15b2068e1c46319c1a42b80493acb128da24b2090739"},"fedora":{"latest":"58394af373423902a1b97f209a31e3777932d9321ef10e64feaaa7b4df609cf9"},"ubuntu":{"lucid":"9cc9ea5ea540116b89e41898dd30858107c1175260fb7ff50322b34704092232","saucy":"9f676bd305a43a931a8d98b13e5840ffbebcd908370765373315926024c7c35e"}}
```

Further, this fixes the bug where the `repositories` file is not created
when saving a specific tag of an image (e.g. ubuntu:latest)

document multi-image save and updated API docs

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: e64131d1bf7c79358d5ee7a1a98626730db3593b
Component: engine
2014-08-28 20:22:33 -04:00
ac32065d5c Update /etc/hosts when linked container is restarted
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
2014-08-27 18:23:41 -07:00
3cca8404b4 add the [OPTIONS] string automatically if there are flags defined
Signed-off-by: SvenDowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 8c6c4a12b7bd53c01998988593789aa16a6d9ac8
Component: engine
2014-08-28 08:50:50 +10:00
676eea0fcd Revert "--help option and help command should print to stdout not stderr"
This reverts commit 61b129d81802e3c988cc0e67e488b24968dd748a.

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2e489073d94a7e2a5df115704a484c34f0b59f29
Component: engine
2014-08-27 18:59:13 +00:00
91ac365d86 Merge pull request #6052 from rhatdan/help
--help option and help command should print to stdout not stderr
Upstream-commit: 76fd51a4789c1af15d6682a01add3ff86df2f5cf
Component: engine
2014-08-27 11:17:16 -07:00
16bdc5c32b Merge pull request #7741 from LK4D4/bump_docs_to_1.15
Bump docs and api to 1.15
Upstream-commit: 4fe6115fb125d5acddec328e2dcfb23b6fe61ffa
Component: engine
2014-08-26 13:44:05 -07:00
b22bbbc6cc Bump docs and api to 1.15
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e261618b24b6837c820dccd8fa734eafc8b7f399
Component: engine
2014-08-26 13:08:50 +04:00
73e4ee940c Fix the other API docs to use an array of key/values
as per #7706

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b0edced87f2a9bd2e85b0a59f6a6c83aff36e445
Component: engine
2014-08-26 11:36:25 +10:00
db566d8d04 Updating LxcConf to match Docker command line
I've changed LxcConf on a previous API document. Not sure why it keeps getting changed back. I'm seeing Docker 1.2.0 command-line calls are still using the array of key/values.

Docker-DCO-1.1-Signed-off-by: getvictor <victor@victoreda.com> (github: SvenDowideit)
Upstream-commit: 216ab880f96125566f2816510ba9d396dcf103f0
Component: engine
2014-08-26 11:36:25 +10:00
4d0ceee016 Merge pull request #7574 from crosbymichael/update-restart-docs
Update flag usages and docs for max restart count
Upstream-commit: b0abd6de635e3bac9c6aa40aa98f53a5d9e15f98
Component: engine
2014-08-25 16:26:06 -07:00
f13f1856df --help option and help command should print to stdout not stderr
--help and help are successful commands so output should not go to error.

QE teams have requested this change, also users doing docker help | less
or docker run --help | less would expect this to work.

Usage statement should only be printed when the user asks for it.
Errors should print error message and then suggest the docker COMMAND --help
command to see usage information.

The current behaviour causes the user to have to search for the error message
and sometimes scrolls right off the screen.  For example a error on a
"docker run" command is very difficult to diagnose.

Finally erros should always exit with a non 0 exit code, if the user
makes a CLI error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 61b129d81802e3c988cc0e67e488b24968dd748a
Component: engine
2014-08-21 15:35:20 -04:00
b6a88dc489 Clean up typos in hub_registry_spec.md
Couple of instances of incorrect articles (e.g. "an Docker Hub").
Upstream-commit: c87d9a1de62678743436887edecdbde2e5a67a1a
Component: engine
2014-08-21 11:04:25 -07:00
55a0a050b4 Merge pull request #7633 from fredlf/root_builder_warning
Added warning re: using root for dockerfile root. Fixes #7612
Upstream-commit: 494bea9fba229dd388d8912fe72936af4a54f73b
Component: engine
2014-08-20 08:02:38 -04:00
46c8de1eaa Cleanup: correct cli --volumes-from description
issue #7580 volumes-from comma separated list mentioned this case.

Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash

Signed-off-by: Deshi Xiao <dxiao@redhat.com>
Upstream-commit: 4d0b88c52f896fe159fe2b1dfd7bdb8116c31da3
Component: engine
2014-08-20 16:31:04 +08:00
4300ef9d0c Fixed a typo and added a bit based on Sven's feedback
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 98dd982586ed9fd99853001d4a27503180e432c4
Component: engine
2014-08-19 17:22:11 -07:00
f066236203 Added warning re: using root for dockerfile root. Fixes #7612
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: b63c10558e6fe187d9cee25a4d8bad4bffd7f79b
Component: engine
2014-08-19 13:39:50 -07:00
43acaaf00e update the cli / man page docs based on what is in master right now
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 018e75a6e4ef955cd802267818b6a6c81a600c9a
Component: engine
2014-08-18 09:31:58 +10:00
99933d1110 Update flag usages and docs for max restart count
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 5ad4879d2a5ee5af95c8b8ab701a621c8b49609a
Component: engine
2014-08-13 18:24:33 -07:00
9b55fc0736 Deprecate --restart on the daemon
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 25c519e829640ebb23061b82c6ace88c5983b63d
Component: engine
2014-08-13 16:08:50 -07:00