1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

4771 Commits

Author SHA1 Message Date
Josh Hawn
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
Sven Dowideit
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
Andy Rothfusz
e36ff12382 Merge pull request #4318 from robpc/patch-1
Fixed typo in Dockerfile example
Upstream-commit: ce8a7352488ede9e78ab0dde642577b506bf28a1
Component: engine
2014-02-27 10:19:09 -08:00
robpc
d011a4181c Fixed typo in Dockerfile example
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com> (github: robpc)

The 'true' command is located in /bin not /usr/bin in the busybox image.
Upstream-commit: 1475dafd5204a6df2e69dec5214270020edf5e50
Component: engine
2014-02-26 19:38:51 -05:00
unclejack
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
unclejack
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
Brian Goff
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
Andy Rothfusz
7c7e0318a0 Merge pull request #4323 from timruffles/patch-2
help contributors be more productive
Upstream-commit: d373cb8c89f40a6d293cbb01b094c4e947057343
Component: engine
2014-02-25 15:03:30 -08:00
Victor Vieux
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
Victor Vieux
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
Victor Vieux
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
Michael Crosby
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
Tim Ruffles
f820af7110 help contributors be more productive
certainly saved me time after I found this in hack/make.sh :)

Docker-DCO-1.1-Signed-off-by: Tim Ruffles <oi@truffles.me.uk> (github: github_handle)
Upstream-commit: 9c4799b7e7627b21f2748458e46d697c3ee4981e
Component: engine
2014-02-24 23:07:40 +00:00
Josh Hawn
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
Guillaume J. Charmes
ccb00fe481 Merge pull request #4281 from unclejack/remove_vagrantfile
Remove Vagrantfile and remove it from all docs
Upstream-commit: 8cfa7715c738756af8a0d5732fe7716882da3a95
Component: engine
2014-02-24 11:39:11 -08:00
Brian Goff
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
unclejack
2cf8cc3b3a Remove Vagrantfile and remove it from all docs
This removes the Vagrantfile and updates the documentation to remove
the steps which explain how to install Docker in a VM via Vagrant.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 67d55860a52bec8b1a1327355b4f27674ec912aa
Component: engine
2014-02-22 03:25:32 +02:00
Sven Dowideit
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
Andy Rothfusz
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
Andy Rothfusz
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
Danny Berger
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
Manuel Woelker
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
Michael Crosby
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
Danny Berger
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
James Turnbull
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
Sven Dowideit
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
Sven Dowideit
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
Andy Rothfusz
5c958f0de4 Merge pull request #4233 from deedubs/patch-1
FIX: Linux mint troubleshooting tip
Upstream-commit: a5515d27e5da9c4442fa9800b8995236d4b5ef2f
Component: engine
2014-02-20 18:07:39 -08:00
Andy Rothfusz
deed4c0865 Merge pull request #4251 from tianon/add-back-grub-info
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
Upstream-commit: 2018d4f9cd1c201d9cb3991b4223cd107daffc63
Component: engine
2014-02-20 18:04:50 -08:00
Andy Rothfusz
ed09089e1d Merge pull request #4261 from amouat/patch-1
Fix misspelling
Upstream-commit: bb368b0563e1c7c2055cc49455ce9a7ba126c713
Component: engine
2014-02-20 17:13:54 -08:00
Andy Rothfusz
bfeed894f7 Merge pull request #4252 from SvenDowideit/mention-scratch-image
lets talk about the other way to make base images
Upstream-commit: 93b98c9fe33a86f7ab8add97a6a6de3769cef65b
Component: engine
2014-02-20 17:12:36 -08:00
unclejack
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
unclejack
c7ecc00d6b docs: explain DNS warnings & how to fix them
This explains how to fix the DNS warnings on Ubuntu and why they're
shown.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: cae554b32e8c3341767e0efe7b9a8977a499d826
Component: engine
2014-02-20 19:53:05 +02:00
Adrian Mouat
6ec2f02312 Fix misspelling
Docker-DCO-1.1-Signed-off-by: Adrian Mouat <adrian@adrianmouat.com> (github: amouat)
Upstream-commit: 88d24df6687d64bf0e19c23973da32eed32fda28
Component: engine
2014-02-20 16:55:07 +01:00
James Turnbull
e100a37878 Site ver for Webmaster tools
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: ef826621585a62d9b563e8ab2fd72f731b14817c
Component: engine
2014-02-20 08:51:39 -05:00
Sven Dowideit
c8d7265499 lets talk about the other way to make base images
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 9f1c69ca7b1b2afd96b4d154431395ee48ada97d
Component: engine
2014-02-20 13:49:15 +10:00
Sven Dowideit
d6638f24e8 Merge pull request #4231 from thschroeter/correct-port-range-in-os-x-install
Correct port range in OS X installation doc
Upstream-commit: d45538f2431ed385bedcf5e11a9104fdee096073
Component: engine
2014-02-20 10:26:11 +10:00
Tianon Gravi
852e62316c Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 42b97be441f5272ead365c3400b91fb756565b1a
Component: engine
2014-02-19 16:54:24 -07:00
unclejack
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
Dan Williams
785171a902 FIX: Linux mint troubleshooting tip
Package is called 'cgroup-lite' not 'cgroups-lite'. Verified on Linux Mint 16.

Ref http://packages.ubuntu.com/search?keywords=cgroup-lite

Docker-DCO-1.1-Signed-off-by: Dan Williams <me@deedubs.com> (github: deedubs)
Upstream-commit: 6073b450e83a67a27ffe8c11ebda36791a7923b4
Component: engine
2014-02-19 17:30:21 -05:00
Andy Rothfusz
97d9349a9d Merge pull request #4225 from cpuguy83/4208-update_docs_to_better_explain_docker_run
Doc: Add basics for controlling a container's lifecycle
Upstream-commit: 16c2031137c5619a67130aa7d4a4f97289d8e808
Component: engine
2014-02-19 13:31:31 -08:00
Andy Rothfusz
98d4bbe0f6 update links
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 196702fbf9905426e590c0dbcb6101e72c62aac6
Component: engine
2014-02-19 10:32:43 -08:00
Thomas Schroeter
569ad8a8f4 Correct port range in OS X installation doc
Docker-DCO-1.1-Signed-off-by: Thomas Schroeter <thschroeter@gmail.com> (github: thschroeter)
Upstream-commit: 8a289a8a54480b968a6924536e084d749e567cf0
Component: engine
2014-02-19 11:21:29 +00:00
Andy Rothfusz
83c5ea4b47 Update the documentation docs with new branch information.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 05c692d64ec9cabe6c16385300405406ebe63f40
Component: engine
2014-02-18 19:21:12 -08:00
Brian Goff
2894395a09 Add basics for controlling a container's lifecycle
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 6dc2f5513648c42b2e71e55c4a4ea6cd3073ce55
Component: engine
2014-02-18 22:11:29 -05:00
Sven Dowideit
ee616cd9b4 we moved the repo
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: e2da84ee63b759173d4919481eeb0c3ddf58cfb5
Component: engine
2014-02-19 11:35:58 +10:00
Andy Rothfusz
983d302f63 Merge pull request #4173 from SvenDowideit/add-most-spacing-to-headers
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
Upstream-commit: ba3cbeb86bafbb6d7553f8954b0bf8d1e2d3f97f
Component: engine
2014-02-18 16:55:10 -08:00
Andy Rothfusz
a4ead08188 Merge pull request #4210 from cpuguy83/4208-update_docs_to_better_explain_docker_run
Add extra info regarding docker run funcationality
Upstream-commit: 13086739656d7866ac5da76aef4fa4d5fa378df0
Component: engine
2014-02-18 15:44:26 -08:00
Andy Rothfusz
f1f31be89b Merge pull request #4114 from SvenDowideit/update-sshd-example
update the sshd example to use just a Dockerfile
Upstream-commit: 836a49a46e6ff51a0ef73eb170935f0d138b932e
Component: engine
2014-02-18 12:12:52 -08:00
Brian Goff
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