p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,365 Commits 2 Branches 295 Tags
88d96e44fdfd3a73c943e6da87e8043a0d8cfdc6
Commit Graph

2222 Commits

Author SHA1 Message Date
Sven Dowideit
88d96e44fd Merge pull request #7908 from nhsiehgit/issue363imgfix 
added a css fix for the image bug issue
Upstream-commit: 4b3ee6c10642a5813b89d5b2e32c01dcede4c871
Component: engine
 2014-09-08 11:10:03 +10:00
Nathan Hsieh
112f364609 added a css fix for the image bug issue 
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
(github: nhsiehgit)
Upstream-commit: e44bdd612b93e806a1cfcba8c156860de5ef3791
Component: engine
 2014-09-05 10:48:51 -07:00
Sven Dowideit
1218d181fb Use a local copy of jquery so that the docs work in China, and offline too. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 5fe94f0d914a20846142a365655dad7a99527b44
Component: engine
 2014-09-05 11:48:34 +10:00
Sven Dowideit
da01801fe3 Merge pull request #7890 from fredlf/docs-cherry-pick-update-process 
Changes to Sven's cherry pick process
Upstream-commit: 03fdc7d2c183948d2415ba1fc19b8678b59d9e7a
Component: engine
 2014-09-05 09:58:18 +10:00
Fred Lifton
d94ba95b52 Changes to Sven's cherry pick process 
Added content and revised after walk-through

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: b23daef3ec9fdecc6b7bcc1e3a657eccf1f5f399
Component: engine
 2014-09-04 13:32:16 -07:00
Jan Keromnes
4d1ff5fd83 Update SSH demo to ubuntu 14.04 
Signed-off-by: Jan Keromnes <janx@linux.com>
Upstream-commit: 98f57d1c392eab7df30fa3179c8e0f99a418e772
Component: engine
 2014-09-04 20:27:41 +02:00
James Turnbull
dfcc6a8638 Merge pull request #7876 from nhsiehgit/typofix 
small typo. wrapping cut code snippet
Upstream-commit: bc26aa7b50a5e9b01b274cffb89e3e0249d279f1
Component: engine
 2014-09-04 12:37:07 -04:00
Sven Dowideit
a87ee70b4f Merge pull request #7828 from vieux/update_api_docs 
Remote api docs for POST /containers/create were out of sync with runconfig/config.go
Upstream-commit: dbe112360718b6ddf6e74c8fcb6cf63204f2bbf2
Component: engine
 2014-09-04 13:05:06 +10:00
Sven Dowideit
7dbfb968f4 Merge pull request #7858 from somaopensource/typo-fix 
Dockerfile documentation typo and content fix
Upstream-commit: e1907bafb7b95a28e262c8f91524834627aaaf91
Component: engine
 2014-09-04 13:03:04 +10:00
Nathan Hsieh
534f9322ba small typo. fixed broken code snippet 
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com> (github: nhsiehgit)
Upstream-commit: adc9a14db49f7e8ffd7cecb788bb9b560a7a3aae
Component: engine
 2014-09-03 17:53:45 -07:00
James Turnbull
47b6756608 Merge pull request #7850 from fredlf/add_cherrypick_process 
Add cherrypick process
Upstream-commit: a3326c346990e1fc797d8de0caace4314bf4ab05
Component: engine
 2014-09-03 17:33:49 -04:00
Oh Jinkyun
2a4b59eccb Dockerfile documentation typo and content fix 
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
Upstream-commit: 476f1df36f6e8aa16a1e302efe8addec1fe191c9
Component: engine
 2014-09-03 19:28:01 +09:00
Fred Lifton
cda308f68d Adding Docs Deploy process to Docs ReadMe 
Additions and revisions to Sven's cherry-pick process doc.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 23cf3f74072290f2de0e57d87af3236d44e0b039
Component: engine
 2014-09-02 17:44:36 -07:00
James Turnbull
a4859208cd Merge pull request #7819 from SvenDowideit/debian-wheezy-notes 
Debian wheezy notes - minor md tweaks
Upstream-commit: 9ffb0f76f2efa1b5a93f78dec8bcd256f3d99fd2
Component: engine
 2014-09-01 15:45:47 -04:00
Victor Vieux
e5f24c4f6a more updates 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2d8695761d0241d2c9b8bfe4274674c702c6a14d
Component: engine
 2014-09-01 18:41:42 +00:00
Anand Patil
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
Eike Herzbach
c3ac4898d5 alternative to exit command: CTRL-D 
Docker-DCO-1.1-Signed-off-by: Eike Herzbach <eike@herzbach.net> (github: eik3)
Upstream-commit: c0c525b3d1a527738c1d942efd70e810908c0eac
Component: engine
 2014-09-01 13:38:25 +10:00
Sven Dowideit
987f07dd0b document the cherry-pick process I'm using to make docs updates 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: ead942156cadb0ef329379a52f1c42d7693a2dea
Component: engine
 2014-09-01 11:32:52 +10:00
Sven Dowideit
8c659df878 Try to go for 80-char lines and a little md wrangling. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 2852037018e435dc61a27725a307595a6f57da40
Component: engine
 2014-09-01 09:55:53 +10:00
Vishal Doshi
533c5e1fed Update debian.md 
Add some instructions for Debian 7 (aka Wheezy/Stable)

Signed-off-by: Vishal Doshi <vishal.doshi@gmail.com>
Upstream-commit: d27f1bb00006fc936c0cb393c93131427e68fef6
Component: engine
 2014-09-01 00:50:49 +05:30
James Turnbull
176595f966 Merge pull request #7751 from dchen1107/master 
Bump containervm version to the latest one: 20140826
Upstream-commit: 014471ad39b2f2a0ffbe4d943c2d0068dd3105e0
Component: engine
 2014-08-31 14:16:22 -04:00
nzwsch
9fba71437d Update nodejs_web_app.md 
Upstream-commit: 2d1ec162be15d6d1107d4775d75744c9d23f8478
Component: engine
 2014-08-30 16:02:47 +09:00
SvenDowideit
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
Victor Vieux
e5a06cff90 Merge pull request #5518 from vbatts/vbatts-save_many 
docker save: ability to save multiple images
Upstream-commit: 6eaac7d5710016d9717cb79b48c1bfe5f3ac92af
Component: engine
 2014-08-28 18:40:28 -07:00
James Turnbull
e57774383c Merge pull request #7789 from SvenDowideit/add-css-for-strong-tag 
Give the <strong> tag some CSS (the .content-body resets it)
Upstream-commit: f1a42fb609202774a96e20de44f2837e7d23def8
Component: engine
 2014-08-28 18:12:54 -07:00
Fred Lifton
ff9b902fe8 Merge pull request #7786 from psftw/volume_removal 
Be more explicit about volume lifecycle
Upstream-commit: d420b2cce0864c85377fa37810c6e2f1abd07350
Component: engine
 2014-08-28 18:11:28 -07:00
SvenDowideit
dc54819eb5 Give the <strong> tag some CSS (the .content-body resets it) 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7de977368cf5d8290c76b7127246996e90932e13
Component: engine
 2014-08-29 11:08:56 +10:00
Sven Dowideit
74bea8e421 Merge pull request #7769 from fredlf/1.2.0_release-notes 
Adding release notes to docs home
Upstream-commit: 2bf41be514e54f951985ee70dafcfc0ae3e1acb5
Component: engine
 2014-08-28 17:37:15 -07:00
Fred Lifton
b17a5fe632 Fixed typos based on feedback. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 810c231b912c0a12acb8eb82a3756276e47fa632
Component: engine
 2014-08-28 17:29:09 -07:00
Vincent Batts
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
Sven Dowideit
7e95f54878 Merge pull request #7749 from hollietealok/master 
Doc: Resizing Boot2Docker Volume with VirtualBox
Upstream-commit: 31d2701377c6667ad099226fe25004345017fb5d
Component: engine
 2014-08-28 16:08:29 -07:00
Hollie Teal
3de067038b Final tweaks. 
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: 0f8d461ed7c8b338d671bea0240b288fa91155b6
Component: engine
 2014-08-28 13:51:38 -07:00
Peter Salvatore
431506329f Be more explicit about volume removal 
Signed-off-by: Peter Salvatore <peter@psftw.com>
Upstream-commit: bfa3d5fa726dc27e44208b51557edca9b64cf4e9
Component: engine
 2014-08-28 16:44:41 -04:00
Hollie Teal
44d46dd074 Added changes brought up in PR discussion. 
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: ce73a3bcf77e1333a000a55de8df033dce6e54ae
Component: engine
 2014-08-28 11:04:53 -07:00
Fred Lifton
2fc0dfef18 Adding release notes to docs home 
This is a temporary solution until we have a dedicated release notes page with automated content.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 1c3b732f8a6ed6f1d01a6ecacc6753899842c2f0
Component: engine
 2014-08-27 18:34:19 -07:00
Erik Hollensbe
9d40e69de7 Update networking doc with clarified text regarding links usage 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: f6a2fc4c3370983043a4284be5d8a09c3ff3bb6e
Component: engine
 2014-08-27 18:23:41 -07:00
Victor Vieux
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
Victor Vieux
f434546a64 Merge pull request #7708 from SvenDowideit/programatic-usage-options 
add the [OPTIONS] string automatically if there are flags defined
Upstream-commit: 96e1c99fb4b16c114f1d6c8cd9b541cc3e6fcf66
Component: engine
 2014-08-27 16:40:17 -07:00
SvenDowideit
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
Fred Lifton
c4216dda04 Updating B2D upgrade instructions for 1.2.0. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 3304d4e98479e54eb9580ce1c42adfb085cfa374
Component: engine
 2014-08-27 14:16:29 -07:00
Victor Vieux
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
Hollie Teal
9ed3d21c9e Added Fred's suggestions. 
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: 77ca0ae9decbdcb8958c20f16d35ec34372b6efe
Component: engine
 2014-08-27 11:49:26 -07:00
Victor Vieux
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
Dawn Chen
d13bbe9188 Bump containervm version to the latest one: 20140826 
Upstream-commit: 9cd77818bbf07ac5278f30f302d82af01243a5c9
Component: engine
 2014-08-26 16:59:21 -07:00
Hollie Teal
24190e7f53 Final changes. 
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: 161cc21f245cf05c6c2c168a6f5981989026e2cb
Component: engine
 2014-08-26 14:01:10 -07:00
James Turnbull
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
Alexandr Morozov
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
SvenDowideit
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
getvictor
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
Avi Miller
1dae3fa4de Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: fcad8ee83a2cf9192ba4f9ec7d5c1d0b03a6aa47
Component: engine
 2014-08-26 11:10:09 +10:00