Commit Graph

2293 Commits

Author SHA1 Message Date
44cb0660ec Merge pull request #8081 from abh1nav/master
Update remote_api_client_libraries.md
Upstream-commit: e9b5acba4b7a0a21e030b775b82351189367eb41
Component: engine
2014-09-18 10:24:53 +10:00
8f5fad7c3d Merge pull request #8025 from davidpelaez-forks/docs-fix
Improved X-Registry-Auth content instructions
Upstream-commit: c7c78acf815c081ca56616a8b4c145217329f5e3
Component: engine
2014-09-18 09:54:25 +10:00
24cc16b5b6 Update remote_api_client_libraries.md
Ordering all clients alphabetically, by language.
Including all available languages in `page_keywords`.

Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com>
Upstream-commit: ad65930d0bda1026a02efd18e9f6c70dfdae4fb6
Component: engine
2014-09-17 03:42:57 -04:00
82736fd21b Merge pull request #8073 from ClusterHQ/7743-restart-policy-api-doc
Add some documentation for the RestartPolicy feature.
Upstream-commit: b03f506303036e32b4a1058da69ee4385cb7979f
Component: engine
2014-09-16 20:06:55 -07:00
56a385e489 Improved X-Registry-Auth content instructions
Hi,

this is a small contribution to fix some slightly unprecise information about the `X-Registry-Auth` header required to pull from private registries through the remote API. After a lot of trial and I error I managed to find that the documentation indications had this issues:

* Apparently single quotes cannot be used and double quotes (regular JSON) is required.
* Also the `auth` key must be passed even if empty or a 403 will result.
* It was not clear what the `serveraddress` had to be.

I added some small clarifications for anyone taking a look at the docs to keep them from the problems I've encountered. Hope this is helpful.

Thanks to all the contributors for bringing so much awesomeness to the linux world. :)

Signed-off-by: David Pelaez Tamayo <hello@davidpelaez.me>
Upstream-commit: 8c2b170c6ef3f8ec40c3a1bd6fdfc37f9271852a
Component: engine
2014-09-16 19:20:47 -05:00
118f175983 Merge pull request #8019 from thockin/add-host
Allow extra lines in /etc/hosts
Upstream-commit: f98a1f1f7d9b3ef10c13fc3b6438c978b4d6aa78
Component: engine
2014-09-16 17:19:16 -07:00
604739ede9 Allow extra lines in /etc/hosts
This adds a --add-host host:ip flag which appends lines to /etc/hosts.  This is needed in places where you want the container to get a different name resolution than it would through DNS.  This was submitted before as #5525, closed, and now I am re-opening.  It has come up 2 or 3 times in the last couple days.

Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 68e48b65a64df10fc797cbaa89d6caa2188eadc9
Component: engine
2014-09-16 23:38:23 +00:00
31081e7819 add 'docker create' man page
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 22eb3a3a50a1fc3762cf4b294c167397591cfd58
Component: engine
2014-09-16 18:40:25 -04:00
f321bfe40f docs fix
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 7c85cf5f390a8fe5088d2e275abfd2404aa19048
Component: engine
2014-09-16 18:40:24 -04:00
764b128304 Add "docker create" support
This exposes the already existing "create container" operation.  It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)

Conflicts:
	api/client/commands.go
	runconfig/parse.go
	server/container.go

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 3a90004f3c2d86ec849f4674c8046693ea061ed1
Component: engine
2014-09-16 18:40:24 -04:00
9aa50abf75 Add some documentation for the RestartPolicy feature.
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com>
Upstream-commit: d758da386a12598533f2388f2887091465c2efd8
Component: engine
2014-09-16 17:40:56 -04:00
bcad074599 Merge pull request #7976 from duglin/Issue7902
Fix for issue 7902 - add trailing zeros to timestamps so logs align
Upstream-commit: 51b26853ef2f124ea837364c02585cbf96999d6a
Component: engine
2014-09-16 13:55:03 -07:00
d25c9ab27a Merge pull request #8062 from vishh/run_in_phase2
Add support for 'docker exec' - phase 2
Upstream-commit: 00fd008170e463426001ec4c56fc4c39450fd8d0
Component: engine
2014-09-16 23:56:12 +04:00
8b57e6f159 Adding docker exec support in CLI.
Fixed a bug in daemon that resulted in accessing of a closed pipe.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c786a8ee5e9db8f5f609cf8721bd1e1513fb0043
Component: engine
2014-09-16 19:24:25 +00:00
a36831cc2a Fix for issue 7902.
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cd7a5f5c0998f288f71d307076e661ed54f1a5f1
Component: engine
2014-09-16 10:28:37 -07:00
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
dade82e420 Merge pull request #8060 from SvenDowideit/missing-t-in-get-api-eg
Added missing 't' from the end of the /images/{{id}}/get eg.
Upstream-commit: b040ba99d09ec18a3dc7f8d9955ae63d6ede7170
Component: engine
2014-09-16 08:43:26 -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
a7a415757f Merge pull request #8034 from michaljemala/patch-1
The default name of the bridge created is called 'docker0'.
Upstream-commit: 023241614efbbf143041f261df969bed6fc7f645
Component: engine
2014-09-15 17:32:57 -07:00
9a9cc402da Help new users if their SELinux is not-upgraded yet.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: a3f51da98adf27d1f312edac04f0f9863019a8e8
Component: engine
2014-09-16 10:18:50 +10:00
1e452211b4 Merge pull request #8036 from unclejack/kernel_version_requirement
docs: change kernel version requirement
Upstream-commit: 2f65ed0968a5a3630872b4e94ed0f347945b4a8f
Component: engine
2014-09-16 10:14:02 +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
bd606a30d9 Merge pull request #8023 from nerab/patch-1
Append instead of replace file contents
Upstream-commit: 4b0bb716270bab57714c54ac12f295345263fc54
Component: engine
2014-09-15 13:54:41 -07:00
ecad7daa7e Merge pull request #8005 from SvenDowideit/document-sshd-env-vars
Document how to pass ENV vars to the user's shell
Upstream-commit: c89242320915c465d3c5d5feae78a175a43bd356
Component: engine
2014-09-15 12:44:56 -07: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
f0e80c1ea0 Removing 'exec' feature from the CLI until the docker daemon supports resizing of
tty sessions for exec'ed commands.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 0029180f7feb59fd0e4fede0bb839e2aa4968811
Component: engine
2014-09-15 17:06:07 +00:00
40a1e3c634 Address review comments.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 669561c2aa8966f9327eca4304a06168bcf5bc49
Component: engine
2014-09-15 17:00:00 +00:00
35e155ffb1 Update cli.md to include 'docker exec' feature.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: e1818d2a69e691acc9fa8d05ee87c07b2e474a0c
Component: engine
2014-09-15 16:59:05 +00:00
78fee01e67 Fix bug in attach handling for docker exec. Add docs for 'docker exec' feature.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: d130c10ab78417ebf64284c2a399304767446c88
Component: engine
2014-09-15 16:59:05 +00:00
883914aefd docs: change kernel version requirement
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 0619512582bada62681816e6cb9cdfe01bf2fdec
Component: engine
2014-09-15 15:15:55 +03: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
df653eaf4f The default name of the bridge created is called 'docker0'.
Upstream-commit: 140229677af2cf4865424e535b06440f043e163b
Component: engine
2014-09-15 12:10:46 +01:00
b39b11e4fc Merge pull request #8028 from SvenDowideit/ekristen-patch-1
HTTP Status 201 not 200
Upstream-commit: 0658be89d0d8b623ba9738eb25e78b666d33b34e
Component: engine
2014-09-15 11:00:05 +10: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
fb75c62292 Merge pull request #8008 from dwgebler/master
fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 0c5a7ad577a0525419e009884ef5e2f0d095d11c
Component: engine
2014-09-15 10:51:38 +10:00
a1ea7562ca Append instead of replace file contents
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
Upstream-commit: 81357e12e7a019c14d87dc491705ad92409293b7
Component: engine
2014-09-13 22:26:40 +02: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
23359870fc Signed-off-by: David Gebler <davidgebler@gmail.com>
modified:   userguide/dockerlinks.md
    fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 78fe117076289695ab03c90d266c47438ab8db7a
Component: engine
2014-09-12 11:04:40 +01:00
ec6541bfd4 Document how to pass ENV vars to the user's shell
As this is a somewhat common question.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 0517099a91a3ca073efb2131684bbf3ab565644a
Component: engine
2014-09-12 13:34:01 +10: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
d739fdd226 Merge pull request #7988 from markotibold/patch-1
Fixed a typo
Upstream-commit: 990da301cf79a07206751b6407125eb4ccbe4d9d
Component: engine
2014-09-12 10:41:12 +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
3be52d7f70 Match docs to actual port range used in code.
Addresses #7985

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: d6f4b2ebb40ac79c3ba21e7196bba3b83124cf16
Component: engine
2014-09-11 17:20:01 -04:00
f59e13d587 Merge pull request #7202 from timbot/add-registry-mirror-flag
Add daemon flag to specify public registry mirrors
Upstream-commit: ed7fb3bbdaa5cbce2563567eaa4cef67fc172270
Component: engine
2014-09-11 11:11:01 -07: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