toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,707 Commits 3 Branches 295 Tags
aecc4da2e0be469c23e78df1147f0867dcdc566b
Commit Graph
3590 Commits
Author SHA1 Message Date
Don Kirkby aecc4da2e0 small formatting and grammar fixes 
Having the line break in the middle of a code span caused the line break to appear on the web site version, even though it doesn't appear in the preview.

The other two changes are just small grammar improvements.

Signed-off-by: don <donkirkby@gmail.com>
Upstream-commit: 5051aee555428f5501de2b8fa24000de093220f5
Component: engine
 2015-05-25 09:05:42 -07:00
moxiegirl 3f5d7444b3 Merge pull request #13303 from moxiegirl/experimental-work 
Experimental features placeholder
Upstream-commit: 8e76c0d1d8b77b86d1131ca82a7034b985a26526
Component: engine
 2015-05-22 08:42:57 -07:00
Sven Dowideit d5d48e47c8 Publish release notes for latest cs Docker engine 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 740b1b5a2d89ef8d2c4c606636e5b42234298734
Component: engine
 2015-05-22 09:14:06 +10:00
Sebastiaan van Stijn d60fe719f4 Merge pull request #13336 from calavera/document_missing_build_flags 
Document missing build flags.
Upstream-commit: b639f00280d974f4c8c3e1ced18afd5173a1f4e3
Component: engine
 2015-05-22 01:03:37 +02:00
David Calavera 50f6b1411a Document missing build flags. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a85b09d8a40456fb5f3b72b7b1999cd9df08c082
Component: engine
 2015-05-21 15:02:00 -07:00
Mary Anthony 19664cd1d4 Experimental features placeholder 
Signed-off-by: Mary Anthony <mary@docker.com>

Adding experimental features into the mix

Signed-off-by: Mary Anthony <mary@docker.com>

renaming file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7231692a02ee6346b051a00fde153675e0a9a771
Component: engine
 2015-05-20 18:10:07 -07:00
moxiegirl 7e35f8d0a4 Merge pull request #13366 from moxiegirl/162-release-notes 
Updating with 1.6.2-cs5 notes
Upstream-commit: 2bf409d4eff3836dd4cc82bc8cb656af2a2dd63d
Component: engine
 2015-05-20 15:03:27 -07:00
Mary Anthony 4a24c72f56 Updating with 1.6.2-cs5 notes 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7554949da654fb55dd1bccc3308ef12c013a16d5
Component: engine
 2015-05-20 14:39:00 -07:00
Jessie Frazelle 0a8a3b1dc5 Merge pull request #13338 from icecrime/13023_experimental_env_var 
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
 2015-05-20 13:04:28 -07:00
Arnaud Porterie 045dd55a7d Add DOCKER_EXPERIMENTAL environment variable 
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
 2015-05-20 12:21:17 -07:00
Alexander Morozov baf6ea6d24 Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
 2015-05-20 11:13:56 -07:00
Sven Dowideit 6f9f58e9c5 Merge pull request #13214 from zoechi/master 
add bwu_docker
Upstream-commit: a09dfbcaad82c8e483189e5966fdff6146105965
Component: engine
 2015-05-20 13:43:16 +10:00
Sven Dowideit 3e16398646 Merge pull request #13315 from SvenDowideit/add-kitematic-docs 
Add Kitematic documentation to docs.master.docker.com
Upstream-commit: a057accb594f3cce0cd6e158050b328ab698cc17
Component: engine
 2015-05-20 12:27:33 +10:00
Sven Dowideit f475565e21 Add Kitematic documentation to docs.master.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 82bd3886d54da4fcbcd29cde957568a75ecd186e
Component: engine
 2015-05-20 01:57:45 +00:00
Doug Davis bca5faa4ca Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7fcf849749322b3e02ae0305f40e505e83b54e9a
Component: engine
 2015-05-19 11:21:05 -07:00
moxiegirl 881a75dcdf Merge pull request #13238 from hqhq/hq_fix_usingdocker_md 
Remove wrong usage in usingdocker.md
Upstream-commit: 6f4b808f415bd762a1090215cc73f66f49e52845
Component: engine
 2015-05-19 09:24:31 -07:00
Qiang Huang 82047fce6d Remove wrong usage in usingdocker.md 
Fixes: https://github.com/docker/docker/issues/13235

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f46cf7329507351e107e3a84132f14ed02dc163b
Component: engine
 2015-05-19 13:07:41 +08:00
moxiegirl a7fe46a565 Merge pull request #13189 from alvinr/mongodb-fixup 
Fixup MongoDB changes to line up with MongoDB 3.0 release
Upstream-commit: 6a18412d5b9c9fae7d7f3ab13eab44e0e4906124
Component: engine
 2015-05-18 15:22:41 -07:00
Alvin Richards e1c50ccb66 Bring MongoDB examples up to date with 3.0 release 
Signed-off-by: Alvin Richards <alvin.richards@docker.com>
Upstream-commit: 3f37afe0b98919b91bffb0f90abe2d25a5ead989
Component: engine
 2015-05-18 13:08:31 -07:00
Sebastiaan van Stijn 30a0089656 Merge pull request #13206 from draghuram/info_api_doc 
Bring /info API doc in line with the actual response.
Upstream-commit: 93825056d8de651e5cbfff9122144e892e988144
Component: engine
 2015-05-18 20:20:57 +02:00
James Turnbull ed62b6ffc8 Merge pull request #12804 from ankushagarwal/configuring-docker 
Add CentOS/RHEL configuration to the config article
Upstream-commit: 8f8ee7d5c3277a3d16556ddcbae40e12f36a154a
Component: engine
 2015-05-18 14:18:32 -04:00
Raghuram Devarakonda 61e72a4efb Bring /info API doc in line with the actual response. 
The fix handles versions 1.18 and 1.19.

Closes #13139.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 9c0608565c93a31d6885842376e82a19db5a7af4
Component: engine
 2015-05-18 13:55:42 -04:00
David Calavera 82bce49b9c Merge pull request #13086 from shishir-a412ed/docker_root_execdriver 
root dir for execdriver (/var/run/docker) should be configurable
Upstream-commit: b785e5091ff35b3fe74ad1d16f77fe611049ae44
Component: engine
 2015-05-15 11:16:12 -07:00
Shishir Mahajan 7f98a41593 root dir for execdriver (/var/run/docker) should be configurable 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 8b2c6cb0729eadb09d688241e0f5debf1d5ccb0b
Component: engine
 2015-05-15 09:30:36 -04:00
Victor Vieux 56ea157723 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
 2015-05-14 17:31:45 -07:00
Günter Zöchbauer 729c010981 Add bwu_docker to the list. 
Signed-off-by: Guenter Zoechbauer <guenter@gzoechbauer.com>
Upstream-commit: ef956253d844589c139d52dec93948744a139491
Component: engine
 2015-05-14 15:27:51 +02:00
Ankush Agarwal f38b9f3ec2 Update Configuring and running Docker article 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9bfe6f0d24a9eb85c7689bc696487d9f016a67d4
Component: engine
 2015-05-14 07:45:20 +02:00
Sebastiaan van Stijn 34f1d71bf5 Merge pull request #11706 from HuKeping/time 
Fix inconsistent date formats in API
Upstream-commit: 1d57642906ced778e826f655aed5a0eaab30fe71
Component: engine
 2015-05-13 20:23:19 -07:00
Hu Keping 2e9a18b752 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
 2015-05-14 18:58:55 +08:00
Sebastiaan van Stijn ab675e423e Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
Upstream-commit: ed257420025772acc38c51b0f018de3ee5564d0f
Component: engine
 2015-05-13 18:30:32 -07:00
Darren Shepherd dc9bbf77b5 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
 2015-05-13 17:56:32 -07:00
moxiegirl 20a74613ee Merge pull request #13193 from moxiegirl/dhe-commercial-release 
adding release note for 1.6.2
Upstream-commit: 32f8a40398f83138af61c2825f2a5fe5e519deb3
Component: engine
 2015-05-13 14:51:50 -07:00
Mary Anthony 0be8a8c7ac adding release note for 1.6.2 
Signed-off-by: Mary Anthony <mary@docker.com>

ugh, cut n paste

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 6c17b4818d207ea610fc6937c270a23881f79708
Component: engine
 2015-05-13 13:54:30 -07:00
Jessica Frazelle 605da98d23 cleanup test-integration 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: e096d56713b23e076f1adc618b5fd765d9485b45
Component: engine
 2015-05-12 15:39:57 -07:00
Jessie Frazelle c0a71ed02d Merge pull request #13127 from shishir-a412ed/exec_opt_doc 
Missing exec-opt[] option in CommandLine docs
Upstream-commit: 5bf2ebf0a5d6eb9043d32dfcee7a4c8beb4e4a7f
Component: engine
 2015-05-12 11:34:51 -07:00
Sebastiaan van Stijn b60e82567d Merge pull request #12362 from ahmetalpbalkan/logs/since 
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
 2015-05-12 09:40:16 -04:00
Tibor Vass 5a91f639c0 Merge pull request #9411 from Mic92/features/zfs-rebased 
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
 2015-05-11 16:53:17 -07:00
Sven Dowideit 56b6d8326b Need more sudo 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c5e93d095005e8b336b845cb94d95f55a594b3ce
Component: engine
 2015-05-11 23:07:22 +00:00
Sven Dowideit 133eb58df5 DHE 1.0.1 release 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 38af208da1414dad81dbd96d7d8678bfb94f9dc0
Component: engine
 2015-05-11 21:23:56 +00:00
Jessie Frazelle 84543fc3ec Merge pull request #13074 from runcom/11824-short-link-if-equals-alias 
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
 2015-05-11 13:18:29 -07:00
Antonio Murdaca 60d5f903de Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
 2015-05-11 21:50:47 +02:00
Shishir Mahajan 7820b09f20 Missing exec-opt[] option in CommandLine docs 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 98277f3cad55e68aa730ba40cb375b268ee794e6
Component: engine
 2015-05-11 15:41:50 -04:00
Ahmet Alp Balkan 365c18080f Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
 2015-05-10 20:42:14 +00:00
Gianluca Borello 9784ed801a Default MAC address generation is not random and should be stated in the documentation. 
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
Upstream-commit: e324f51e5b7bf9d28701af97bdb9fcdc26fc7699
Component: engine
 2015-05-10 08:11:26 -07:00
Ma Shimiao 560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
Jörg Thalheim 9c30c1f4a1 docs: move zfs.fsname option to storage option section 
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bdf784ae4ae62a560f28e974ff9b9c26aaf8a533
Component: engine
 2015-05-08 17:48:20 +02:00
Jörg Thalheim e5820ed7e4 Implement Docker on ZFS 
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: d5151ca8ab5d90300839c8572cb96577de4d6233
Component: engine
 2015-05-08 17:48:20 +02:00
Jessie Frazelle bda12eddfc Merge pull request #12422 from wlan0/logopts 
add log opts flag to pass in logging options
Upstream-commit: fe3becee34a93ebffe4a9fbcb0057d2b82242307
Component: engine
 2015-05-07 18:10:04 -07:00
Jessie Frazelle 9b361889f7 Merge pull request #13027 from runcom/fix-typo-reference-remote-api 
Fix typo in the api remote reference for links
Upstream-commit: 128a07b512bf119d2cf3ae536e1cb6d19bc0f460
Component: engine
 2015-05-07 17:53:21 -07:00
Jessie Frazelle 92cec4b2c1 Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode 
add support --net=container with --mac-address, --add-host error out
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
 2015-05-07 17:13:32 -07:00