Commit Graph

87 Commits

Author SHA1 Message Date
e2cc165aaf Adding the new options to the docker ps documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding the new options to the `docker ps` documentation.

URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding CLI options to the commandline reference documentation.

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

changing indention

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: baa70e975186bb0ee8a4b16b9374cb6e794f8975
Component: engine
2014-03-11 19:51:30 -05:00
dd4dea6b01 Adding options to docker restart documentation
URL of page is: http://docs.docker.io/en/latest/reference/commandline/cli/#restart

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: 694c8e7dfca16fabf63e6fdcdce4151c8440a7a3
Component: engine
2014-03-08 17:23:06 -06:00
13e7bd4fb6 Adding the new options to the docker ps documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: 59acb8c83d3f21ae82c540774653ccd0a46f1a1f
Component: engine
2014-03-08 16:32:00 -06:00
6f1e791920 Merge pull request #4475 from ubermuda/patch-1
Added Docker-PHP to the list of client libs
Upstream-commit: 44fc1dfca25dbd873c9d99eda73eba317796ec53
Component: engine
2014-03-06 14:54:33 -08:00
81ffbaf8cc Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command
Add ability to force removal of running container via docker rm -f
Upstream-commit: e388b6aba5e7d75fecf87223abcd3c1deffd27f0
Component: engine
2014-03-07 00:05:57 +02:00
e582b9139d Added Docker-PHP to the list of client libs
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com> (github: ubermuda)
Upstream-commit: 511b57bee5bfc80cab26df044e1e821d01064192
Component: engine
2014-03-06 20:33:51 +01:00
e23e08e833 Create a -G option that specifies the group which unix sockets belong to.
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
Upstream-commit: 644acec2f7e3b144a423d0f0a6c900701abdc511
Component: engine
2014-03-06 11:17:04 -08:00
6e470bbbd0 Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated
Flag 'docker-js' as outdated (Fix #4467)
Upstream-commit: 8d947da826498fb4b563edb1e68396c821238a39
Component: engine
2014-03-06 09:37:34 +10:00
cb1dbed1c9 Flag 'docker-js' as outdated
Upstream-commit: 5e32c40795e527cc2e916fe5b8970b37e9485266
Component: engine
2014-03-05 20:16:41 +08:00
821bf64ace Consistently capitalize CLI options
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 41bf38e44d8ef53468e76870182fa05c515a1cf5
Component: engine
2014-03-04 20:22:51 -05:00
91922e3e79 Merge pull request #4438 from crosbymichael/update-docs
Update daemon docs for exec drivers
Upstream-commit: 20ddd34d0533ca05e3d09c5d4a8414033d69cfba
Component: engine
2014-03-04 07:56:30 -05:00
84d85e3b67 Update daemon docs for exec drivers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0f96a749ab812d76389c4a48c71ff9a01e48488e
Component: engine
2014-03-03 17:43:08 -08:00
04d68b69ad handle symlinks for Docker's root dir & TMPDIR
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.

It also enables handling symlinks for TMPDIR.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
2014-03-03 23:00:53 +02:00
085a080854 Merge pull request #4385 from khia/json_format
Support json output in --format flag of docker inspect
Upstream-commit: 37d0ce42c689d3691824c92db81b9c7c9cd98479
Component: engine
2014-03-03 12:36:47 -08:00
5d5ad8f867 Merge pull request #4321 from vieux/docker_run_-it
Add support for docker run -it or docker images -qa
Upstream-commit: 7531f82c70e44ac93d540c380ecfd2a52980f86f
Component: engine
2014-03-03 20:52:10 +02:00
9a5ac39c28 Support json output in --format flag of docker inspect
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com> (github: khia)
Upstream-commit: e07920f680a829724f617819f0c5715ed9b5194a
Component: engine
2014-02-28 17:34:31 -08:00
a28a17100c Merge pull request #4390 from SvenDowideit/spelling-1
one ponted out by lukaspustina, and one that I bet I added
Upstream-commit: ba2a042aea3d8bb03b3e09e7eb7c6357c754bea0
Component: engine
2014-02-28 13:39:40 -08:00
d02adb2017 Merge pull request #4319 from jlhawn/docs-docker-io-api
Added documentation for docker.io OAuth & Accounts
Upstream-commit: 70d2ca4ed39945fbef2337260b0123bdfabc9561
Component: engine
2014-02-28 13:35:33 -08:00
e7b76315fc one ponted out by lukaspustina, and one that I bet I added
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b16f46635459b9e6f58a733e39ccb21c767d8e33
Component: engine
2014-03-01 05:12:21 +10:00
d1105407b3 Add ability to force removal of running container via docker rm -f
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: d78fcb32ffd4736462792407abe734b51b81367a
Component: engine
2014-02-27 23:31:36 -05:00
d41cda6cb2 Updated OAuth docs per arothfusz's comments
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.

Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: b6a5082bd1cfa297637b38aa6692239a679d97e8
Component: engine
2014-02-27 14:21:24 -08:00
f4bfb3c930 add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: cdec3297f7f06fb383c1be1aaec67417a2d4c7f9
Component: engine
2014-02-28 08:14:22 +10:00
a01a267fdb Merge pull request #4078 from vieux/rewrite_rmi
Rewrite docker rmi
Upstream-commit: bde192bb80079ad89057a6df5ce676c5b3429901
Component: engine
2014-02-26 21:30:24 +02:00
1d5826bd31 Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build
make docker build -rm=true default
Upstream-commit: 31ddc1669250565bdf41bc5329d16eb7e5bd7227
Component: engine
2014-02-26 19:03:59 +02:00
0eecb77d00 make docker build -rm=true default #4292
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 0b4aeb79d9e920f5a713a8ae57e3fdde011689e6
Component: engine
2014-02-26 11:04:06 -05:00
cae176477e add missing doc
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 10faefac3b88069f22283f3f2e018d100a66f2b9
Component: engine
2014-02-25 21:08:08 +00:00
4637d495ff fix doc
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 21f56c04e4f4df4e171985896b54b243c6ef0fcb
Component: engine
2014-02-25 21:08:08 +00:00
0820020142 bump API version
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e7cc88c39f302c020f70a00bca54bddeecb608a4
Component: engine
2014-02-25 21:08:07 +00:00
781668c938 Merge pull request #4189 from vbatts/vbatts-execdriver_flag
execdriver flag for docker daemon
Upstream-commit: c9addff4449d0d6671373b9a6376fbe94bb43fb4
Component: engine
2014-02-24 23:28:17 -05:00
9ab15c1e2d Added documentation for docker.io OAuth & Accounts
OAuth docs:
  documented the OAuth authorization flow and how to register your application

Account docs:
  documented getting/updating user profile data
  documented getting/updating user email data

Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 00bb76f35b4d21d0aaddb23f93d663ec02faea1a
Component: engine
2014-02-24 13:48:43 -08:00
09b4fa1ad0 Remove uneeded wording in Dockerfile format
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: cfdfd46e49404ad9dfb28810bd7a83658f35c42b
Component: engine
2014-02-23 15:45:44 -05:00
64257510ad Merge pull request #4245 from manuel-woelker/docs-remote-api
Added some documentation for the JSON params in the /containers/create and /containers/(id)/start remote APIs
Upstream-commit: f36d455144469a8c7574afe6d9932c530fc84da8
Component: engine
2014-02-22 10:15:20 +10:00
dd7ff4fc5b Merge pull request #4280 from dpb587/bugfix-mtu-typo
Fix argument usage typo for docker --mtu
Upstream-commit: 36fd9f3c53621f27ee5346ef52a6dde6d8e1d580
Component: engine
2014-02-21 10:59:42 -08:00
5cecf0201f Merge pull request #4277 from SvenDowideit/tianon-made-me-doit
small update to API docs to go with #4276
Upstream-commit: 0c8c87d9ff8a4dcc794c137d69ef3fd91527035e
Component: engine
2014-02-21 10:57:51 -08:00
773b1a3574 Drop -mtu from docs in favor of --mtu only
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
Upstream-commit: afb565e97c79b87d4563e8e728513ca5b50514c7
Component: engine
2014-02-21 13:43:50 -05:00
1377718158 docs: document some JSON parameters /containers/create and /containers/(id)/start in remote api (fixes #2948)
Docker-DCO-1.1-Signed-off-by: Manuel Woelker <github@manuel.woelker.org> (github: manuel-woelker)
Upstream-commit: c3faab3955a6cfb5b36249889269dd8d272e9e8b
Component: engine
2014-02-21 19:25:49 +01:00
bd08308ce7 Merge pull request #4260 from unclejack/onbuild_fixes
forbid chained onbuild, from & maintainer triggers
Upstream-commit: ab63975b8e4153f65cc9ce200f20c39caec08664
Component: engine
2014-02-21 12:50:40 -05:00
1ddffb7445 Fix cli argument usage typo for docker --mtu
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
Upstream-commit: 8c4160fe61151f38f471e93e7bf98dcbf5406a9e
Component: engine
2014-02-21 10:51:51 -05:00
6526146793 Merge pull request #4248 from unclejack/https_fixes
don't skip cert check for an example & use HTTPS
Upstream-commit: ea9dd4ca5927dd3694b43287c13fe7f37aaf9108
Component: engine
2014-02-21 10:47:44 -05:00
611dddcc47 small update to API docs to go with #4276
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f83e553452db74b73e9de7fa770646e72e7af88f
Component: engine
2014-02-21 17:42:02 +10:00
2524fdc1ab reinforce that docker build --rm is a good default to use
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: e59485e148f5d1ab0cf5ec18ca3bb7c684e8cf7b
Component: engine
2014-02-21 13:51:08 +10:00
87c3fb28d2 forbid chained onbuild, from & maintainer triggers
This changes the way onbuild works:
- forbids the chaining of onbuild instructions
- forbids the use of `onbuild from`
- forbids the use of `onbuild maintainer`

It also makes docker throw errors when encountering such triggers when
executing the triggers during `FROM`.

Three tests have been added:
- ensure that chained onbuild (`onbuild onbuild`) is forbidden
- ensure that `onbuild from` is forbidden
- ensure that `onbuild maintainer` is forbidden

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b829e96cde4f798bc21f05a763b2f6a623dfe1eb
Component: engine
2014-02-20 20:31:04 +02:00
0802cd5e0f don't skip cert check for an example & use HTTPS
This changes two URLs from http to https and it fixes a Dockerfile to
stop skipping certificate validation. It also adds the ca-certificates
package to that Dockerfile example.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 73a277eb2fd66b815b11e9d2caff2c31c18a0854
Component: engine
2014-02-20 01:11:04 +02:00
24eab2e417 Add extra info regarding docker run funcationality
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 349adf4d4df63cd35ecfd74aa21de01629964ea5
Component: engine
2014-02-18 15:08:09 -05:00
3700ea5ec4 my attempt to disentagle repository and registry (Issue #1439)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 940c381dd5898df4dd863a2d76a122b6610f2940
Component: engine
2014-02-18 20:16:08 +10:00
c39069efb0 execdriver flag for docker daemon
like the storage-driver flag, this implements a flag for choosing the
  execdriver to be used, defaulting to lxc.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5f84d7f3146db1ac15974f1e28f77834de3e63ff
Component: engine
2014-02-17 20:03:53 -05:00
4a474363c9 Merge pull request #4113 from SvenDowideit/build-quiet-help
add a little reenforcement to the help for docker build -q
Upstream-commit: 382659e03a59d68007fee1b54192233f7484c035
Component: engine
2014-02-17 10:38:43 -08:00
e184f36805 Support submodules when building from a gh repo
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io> (github: songgao)
Upstream-commit: c9ae66ffe375156ddf39cb41664224d6e1a6f096
Component: engine
2014-02-17 12:08:23 -06:00
6180b3b390 Add dockerode NodeJS implementation
Also correctly case 'JavaScript'

Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com> (github: mikemaccana)
Upstream-commit: 02d94dcf6ec2541c66b081d4dc251725f994747c
Component: engine
2014-02-17 14:04:47 +00:00
66f105510e add a little reenforcement to the help for docker build -q
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 797b7d3446304be01c220c29f3dc6c4dcc2711be
Component: engine
2014-02-17 11:35:55 +10:00