docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
22,850 Commits 12 Branches 296 Tags
f60838eaae16f2b2b40d76d63d2ca86c02704024
Commit Graph

21386 Commits

Author SHA1 Message Date
Aditi Rajagopal
54863887b3 Document Volume Removal in User Guide 
Resolves: #20113
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>

Carry #20160
Tighten language
Updating with comments
Removing articles which is empty
Adding Brian's comments
Putting back what I took out

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ae66d536a5928c9134a4a70761ebc93de0320197
Component: engine
 2016-03-11 12:29:47 -08:00
Arnaud Porterie
14e98ee04a Merge pull request #21127 from icecrime/add_john_maintainer 
Add @jhowardmsft to maintainers
Upstream-commit: 949e53a0f1407a550051753f3d92cad5e0670edc
Component: engine
 2016-03-11 11:14:37 -08:00
Arnaud Porterie
2d0ed2163e Add @jhowardmsft to maintainers 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 11d10b77acd106c9a5857de382a719efb6b65a47
Component: engine
 2016-03-11 10:47:14 -08:00
David Calavera
841463d9b8 Merge pull request #21129 from allencloud/fix_typos 
fix typos
Upstream-commit: 9842c7a741ee480c71bfd8e71e1f22893d010411
Component: engine
 2016-03-11 10:16:40 -08:00
David Calavera
b1a872ce31 Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry 
Remove Windows-specific default registry definitions
Upstream-commit: 12c67f42d85103c57c14f27579ff46fccdc3ee07
Component: engine
 2016-03-11 09:31:55 -08:00
Tibor Vass
19d229cc30 Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand 
Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
Upstream-commit: 1c0474ed63ac08a3e280ecf7eebcb9e53ae92c8d
Component: engine
 2016-03-11 10:54:48 -05:00
allencloud
1585d5df26 fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: bbeb859b6490a03d7c4265762711b551c22e914d
Component: engine
 2016-03-11 23:22:16 +08:00
Brian Goff
a1a5012791 Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx 
Fix the vendoring script on MacOS X
Upstream-commit: 9ad946eded6fb05ddc331bd565473ea68b83bdd9
Component: engine
 2016-03-10 22:45:55 -05:00
Aaron Lehmann
88e5d1888e Remove Windows-specific default registry definitions 
Going forward, Docker won't use a different default registry on Windows.
This changes Windows to use the standard Docker Hub registry as the
default registry.

There is a plan in place to migrate existing images from the Windows
registry to Hub's normal registry, in advance of the 1.11 release. In
the mean time, images on the Windows registry can be accessed by
prefixing them with `registry-win-tp3.docker.io/`.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 87535ca2e9fee074b4174ecc5b01c91a9e922f54
Component: engine
 2016-03-10 18:33:14 -08:00
Ken Cochrane
f1c35029ca Put back the hack that was originally in place. 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 94445b2fea906df1bedec40284591d752def18e2
Component: engine
 2016-03-10 20:27:44 -05:00
Brian Goff
2a8c1acb35 Merge pull request #21102 from tiborvass/template-improve-contrast 
Improve github templates
Upstream-commit: edf3c0f11240368baf54ece0b3cb2b5214294b89
Component: engine
 2016-03-10 20:18:30 -05:00
Sebastiaan van Stijn
76b88b0399 Merge pull request #21045 from calavera/registry_config_options 
Move registry service options to the daemon configuration.
Upstream-commit: 1d094255d57090d34b2c11c12b253c277ae1ce28
Component: engine
 2016-03-11 00:48:55 +01:00
Tibor Vass
28709e4abf Improve github templates 
Add more contrast and change `you` to `I` in pull requests template.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8d9396c5f93ff0f8597e07abf88839071999eadf
Component: engine
 2016-03-10 18:42:44 -05:00
Ken Cochrane
7b9d944eb3 Fix the vendoring script on MacOS X 
The version of sed on MacOS X is different then the one on linux. The mac version
requires a parameter for the inline (-i) flag, where this isn't required on linux.
On the mac it thinks the -e flag is the parameter, and it causes the vendoring script
to fail.

This fix adds an empty string '' as a parameter to sed, which works fine on both the
mac and linux versions.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 9488696814f481d2b0dce03d77657ec6860b9701
Component: engine
 2016-03-10 16:43:53 -05:00
Sebastiaan van Stijn
8dd2de600d Merge pull request #20190 from rhatdan/volumeMan 
Add a parent man page for docker volumes command
Upstream-commit: 496aca386a0bb2ea3a5a42314642ba4693e616ae
Component: engine
 2016-03-10 22:36:50 +01:00
Arnaud Porterie
3dbccba8c4 Merge pull request #20478 from msabansal/HNSIntegration 
Windows libnetwork integration
Upstream-commit: 2b8e7ad4609e668d2187e81055e1e76ed0c11552
Component: engine
 2016-03-10 13:33:04 -08:00
David Calavera
91021f9750 Move registry service options to the daemon configuration. 
Allowing to set their values in the daemon configuration file.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 59586d02b1cc004f14cd7ff6b454211f562da326
Component: engine
 2016-03-10 11:53:11 -05:00
David Calavera
6152b50e42 Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting 
Windows: Revendor github.com/Microsoft/go-winio
Upstream-commit: 9ff74391620c65661d2d543598fe96efb37f08fc
Component: engine
 2016-03-10 08:28:36 -08:00
David Calavera
75088991dc Merge pull request #21018 from hqhq/hq_fix_race_exec_tty 
Fix race condition when exec with tty
Upstream-commit: 790d8f8520d23d16cc0a141e6fd56246a45b327a
Component: engine
 2016-03-10 08:27:54 -08:00
Alexander Morozov
536ff97acf Merge pull request #20958 from calavera/basic_function_templates 
Provide basic string manipulation functions for template executions.
Upstream-commit: 943ae26bc01913fefe415defc575ea10e24f6a2b
Component: engine
 2016-03-10 08:08:32 -08:00
Dan Walsh
9361cfbf1b Merge branch 'master' of github.com:docker/docker into volumeMan 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 04e9087d5d8d6e4b9857ebe10e153da67433d401
Component: engine
 2016-03-10 09:39:16 -05:00
Sebastiaan van Stijn
1f8ebb7040 Merge pull request #21043 from runcom/plugin-sdk 
docs: extend: plugins: mention the sdk + systemd socket activation
Upstream-commit: e7093a95cf324c7928e340c5a388062a1ed05625
Component: engine
 2016-03-10 15:12:23 +01:00
Antonio Murdaca
b065a55c44 docs: extend: plugins: mention the sdk + systemd socket activation 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 97e07ca10ac315b3d6bbaf72fbe1fd4f7b9a3a2d
Component: engine
 2016-03-10 12:17:06 +01:00
Sebastiaan van Stijn
3fff146dfd Merge pull request #21073 from moxiegirl/close-carry-20377 
Add missing fields for NetworkSettings
Upstream-commit: f70f570641b8e7cec5767f26cc7fc9f31f6294e7
Component: engine
 2016-03-10 10:59:15 +01:00
msabansal
23f9a9fa41 Windows libnetwork integration 
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: e8026d8a98ef30ff0ada303404e02567caebb1b0
Component: engine
 2016-03-09 20:33:21 -08:00
Aaron Lehmann
e44c6b6aca Merge pull request #21063 from allencloud/fix-typos 
fix some typos.
Upstream-commit: 49485b769cdcc220418a36cfd3c1e50fd03b130d
Component: engine
 2016-03-09 20:24:56 -08:00
Brian Goff
f60019e64d Merge pull request #21019 from aboch/se 
Add port configs to Sandbox and libnetwork vendoring
Upstream-commit: d99be399c35df921970bb8bebf4b4bdf774849b3
Component: engine
 2016-03-09 22:27:37 -05:00
allencloud
16d6520e91 fix some typos. 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 34b82a69b94ef9c7913e2809ae918e6f4331201e
Component: engine
 2016-03-10 10:09:27 +08:00
Arnaud Porterie
200e6acd5b Merge pull request #21074 from mlaventure/test-userns-centos 
Update UserNamespaceInKernel test requirement to handle redhat
Upstream-commit: bd7c95e306c747e21e0dea48d068adc1c7b59132
Component: engine
 2016-03-09 17:53:13 -08:00
David Calavera
a66058a138 Provide basic string manupilation functions for template executions. 
This change centralizes the template manipulation in a single package
and adds basic string functions to their execution.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 8514880997bd1bc944769dcc41e52307bb01f7ff
Component: engine
 2016-03-09 19:37:12 -05:00
Alessandro Boch
80ec175db5 Add Exposed ports and port-mapping configs to Sandbox 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b8a5fb76ea3d2ba3168380757cb5a746350ea451
Component: engine
 2016-03-09 14:07:23 -08:00
David Calavera
f21d466c67 Merge pull request #21067 from LK4D4/remove_comment 
Remove obsolete comment
Upstream-commit: fcff343cb49f37d7c5b59c121b0cd1900e44c542
Component: engine
 2016-03-09 13:27:12 -08:00
Kanstantsin Shautsou
8fd7f3b992 Add missing fields for NetworkSettings 
Dump from 1.10.1 has this fields.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>

Close and carry #20377
Include David's request

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 205844875cb848b04fef401d3e7fcc3a8959bba0
Component: engine
 2016-03-09 12:43:48 -08:00
Kenfe-Mickael Laventure
f3e1cfee9f Update UserNamespaceInKernel test requirement to handle redhat 
On redhat based distribution, checking that USER_NS is compiled in the
kernel is not sufficient, we also have to check that the feature as
been enabled.

With this commit, it is now done by checking the content of
`/sys/module/user_namespace/parameters/enable`.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6cbff9505c992bd1e61ea7943737dac04ba665ea
Component: engine
 2016-03-09 12:42:59 -08:00
Brian Goff
0cf9fc3f62 Merge pull request #21053 from WeiZhang555/vendor-engine-api 
Vendor docker/engine-api
Upstream-commit: 9bfdb93e3aaedf5c050def582d6c820cec00f300
Component: engine
 2016-03-09 15:19:26 -05:00
Alexander Morozov
57871b45b1 Remove obsolete comment 
There is no more race

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8706c5124a09ba4ad49ca2eb009bdcaec98b7637
Component: engine
 2016-03-09 09:38:39 -08:00
Tõnis Tiigi
03dcde6cf7 Merge pull request #21013 from calavera/events_since_nano 
Compare event nanoseconds properly to filter since a specific date.
Upstream-commit: f97ab358cb9443816ff436aac410ef75ca385530
Component: engine
 2016-03-09 09:30:54 -08:00
David Calavera
895ccf6abc Merge pull request #21056 from askb/optimize-TestBuildUsersAndGroups 
Optimized integration test case DockerSuite.TestBuildUsersAndGroups fixes #19425
Upstream-commit: 016be532368ac45d425b770e0b02aa12de7d5620
Component: engine
 2016-03-09 09:15:01 -08:00
Phil Estes
eb5f497921 Merge pull request #20965 from yongtang/19425-DockerSuite.TestRunUnshareProc 
Optimize slow bottleneck test of DockerSuite.TestRunUnshareProc.
Upstream-commit: 5d3ae7f98999e3f01125c5dd9ac73757dbb849ef
Component: engine
 2016-03-09 10:32:09 -05:00
Sebastiaan van Stijn
2109e80f1b Merge pull request #20930 from cloojure/patch-3 
Update dockernetworks.md
Upstream-commit: faacbcf53e8c702c211d9be549d06c1aff6fb100
Component: engine
 2016-03-09 15:58:38 +01:00
Anil Belur
578f7ee12a Optimized integration test case DockerSuite.TestBuildUsersAndGroups for #19425 
Removed unnecessary RUN statements and combined some of the RUN statement into a single line.

The runtime performance is seen as follows:
pre-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
63.074s

post-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
49.698s

Signed-off-by: Anil Belur <askb23@gmail.com>
Upstream-commit: deeb5c95e2eaa58d4490cb126839b8bc41e5ba08
Component: engine
 2016-03-09 18:00:56 +05:30
Zhang Wei
2793bc287f Vendor docker/engine-api 
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: f446771f0b20330523d014656427a95000540735
Component: engine
 2016-03-09 15:52:44 +08:00
Antonio Murdaca
e7ce25846b Merge pull request #21033 from estesp/workdir-perms-userns 
Ensure WORKDIR is created with remapped root ownership
Upstream-commit: 3d09842713b98dc59a0833c0fc110c14c5778d70
Component: engine
 2016-03-09 07:22:08 +01:00
Alessandro Boch
d91c7046be Vendoring libnetwork v0.7.0-dev.5 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 5a654089416762da484ca9929fcd216076b591ab
Component: engine
 2016-03-08 18:47:02 -08:00
Tianon Gravi
a2e5fd5fd7 Merge pull request #20342 from vijaykilari/fix_20325 
#20325 : arm64: Use gccgo as bootstrap for compiling golang
Upstream-commit: 0771230daac8aa2d66edddecd935d2c182850077
Component: engine
 2016-03-08 16:11:42 -08:00
Sebastiaan van Stijn
40f2f9ab61 Merge pull request #20940 from HackToday/fixsave 
Refine error message when save non-exist image
Upstream-commit: 6b0119aefbc4b839d702cdc374c7d4d5cf988c37
Component: engine
 2016-03-09 00:59:43 +01:00
David Calavera
775d953faa Compare event nanoseconds properly to filter since a specific date. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a9f2006f105340890787799a5686b9760ab6be42
Component: engine
 2016-03-08 17:07:58 -05:00
David Calavera
356157b64b Merge pull request #18697 from jfrazelle/pids-cgroup 
Add PIDs cgroup support to Docker
Upstream-commit: dd32445ecc6b706e8681dcc9d80c42c9b6cbf6cd
Component: engine
 2016-03-08 14:03:36 -08:00
David Calavera
5b6f8bb922 Merge pull request #21035 from LK4D4/exec_ids 
make TestExecInspectIDs less racy
Upstream-commit: 76a5ab3b43c93352e46c6a5c236f85d3281380fe
Component: engine
 2016-03-08 13:02:01 -08:00
Sebastiaan van Stijn
9ef58d92bf Merge pull request #21032 from trishnaguha/docker-group 
Creates docker group for non-root access
Upstream-commit: 95bc1f1ccdf7c1172481d7ed663bfe5d71b10352
Component: engine
 2016-03-08 21:50:44 +01:00