docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
14,006 Commits 12 Branches 297 Tags
f673778d3a85fd2c16ea3947e25ff215381b2eb4
Commit Graph

2883 Commits

Author SHA1 Message Date
Alexander Morozov
dad3640059 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
 2015-03-23 11:34:33 -07:00
Tibor Vass
69bd180001 Merge pull request #10431 from duglin/Issue10391 
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
Upstream-commit: 61966d281bb715a2359b27bcd30d0d59c98d2812
Component: engine
 2015-03-23 13:30:11 -05:00
Jessie Frazelle
088f0e2cb3 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
 2015-03-22 19:16:23 -07:00
moxiegirl
d411e326ae Merge pull request #11505 from lloydde/doc-ref-run-it 
doc: reference/run introduce -it .
Upstream-commit: 0b63b343e8cb83d21c9de5d986b0a4ae01fb4646
Component: engine
 2015-03-22 19:14:34 -07:00
moxiegirl
0485dd2e93 Merge pull request #11550 from moxiegirl/adjust-mac-install 
Clarifying structure in light of Kitematic
Upstream-commit: 0926a023d65ae7d5cb528d205a4e1fe32b47c3e4
Component: engine
 2015-03-22 19:13:38 -07:00
Casey Bisson
7cd85af5c7 Merge branch 'master' of github.com:docker/docker into joyentinstall 
Reolved conflict in:
	docs/mkdocs.yml

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
 2015-03-22 18:19:27 -07:00
Sven Dowideit
7d0f834cb3 Merge pull request #10903 from programmerq/docs_submodules 
Update docs around private github submodules in automated builds.
Upstream-commit: cce196d64b50384a71a0fbf1f1026e8580ff9d15
Component: engine
 2015-03-23 11:01:28 +10:00
Sven Dowideit
2b2e612495 Merge pull request #11400 from ahmetalpbalkan/docs/azure 
docs: Add Microsoft Azure installation instructions
Upstream-commit: cf7d093e17d89371cf375a5f66e8103d7dde6e3c
Component: engine
 2015-03-23 10:03:00 +10:00
Raghuram Devarakonda
9e9a6a8f56 Fix typo in git setup doc. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: f5c60fc0fd4e0daa068134ab9a887f69c797bae7
Component: engine
 2015-03-22 11:22:47 -04:00
Peter Waller
7c1bfa9093 Implement build cancellation 
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
 2015-03-22 11:31:28 +00:00
Mary Anthony
d2583ecaca Clarifying structure in light of Kitematic 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f3b7bf9682c10cdd6dfbdca79080790d7411c1b7
Component: engine
 2015-03-21 18:20:25 -07:00
sidharthamani
a7d21898b0 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
 2015-03-21 18:01:18 -07:00
Mary Anthony
3e6a579992 Update contributor docs and triage to match new labeling system 
Add clarification around experience
Adding test
improvement > enhancement

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3ff9991bb27b238b0df4f67b6714174ca92223eb
Component: engine
 2015-03-21 15:55:33 -07:00
Doug Davis
490a18c994 Fix some escaping around env var processing 
Clarify in the docs that ENV is not recursive

Closes #10391

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6d66e3e7a5ecb021a9e89c4f85fadecf23e2000c
Component: engine
 2015-03-20 20:09:00 -07:00
Todd Whiteman
e8bf8127c1 docs: cli: reorder rename command to be in alphabetical order 
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: fe21c7a4bebd5d6d0065e0529d03a03723fc697b
Component: engine
 2015-03-20 14:51:39 -07:00
Casey Bisson
7772935737 updated text 
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: 19e3db35039ae80409623266906093b2314bd970
Component: engine
 2015-03-20 14:44:24 -07:00
Casey Bisson
f8785b1704 Merge branch 'master' of github.com:docker/docker into joyentinstall 
Resolved conflict in the following file:
	docs/sources/installation/MAINTAINERS

File was deleted upstream and changed in this branch. Deleting the file in this branch as well.

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: cb2280c98e3a2aa389b64adcafb30a446e2b6d24
Component: engine
 2015-03-20 14:37:17 -07:00
Ahmet Alp Balkan
40e97918dc docs: Add Azure installation instructions 
Adding instructions that refers to the Microsoft Azure
documentation on creating Docker-ready Linux VMs on Azure
platform.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 72fa3fcaeacfcfebdad463d965ff1d6a3e95d516
Component: engine
 2015-03-19 21:28:29 -07:00
Sven Dowideit
12a935da06 Small copy edits 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 32efa559a3b643df117222e998b2d9ab550b0060
Component: engine
 2015-03-20 14:09:30 +10:00
Jessie Frazelle
5e34656977 Merge pull request #11470 from albers/events-filter-name 
Remove 'name' filter from docker events documentation
Upstream-commit: f574262ff74126f080a7e9bd16f0e4017761de94
Component: engine
 2015-03-19 16:22:30 -07:00
Jessie Frazelle
586d8f70ba Merge pull request #11498 from jbnunn/patch-1 
Typo/grammar corrections to dockerizing.md
Upstream-commit: fcc87c0df0c3d5da72786db2df9dc6b4ed090a08
Component: engine
 2015-03-19 16:21:29 -07:00
Michael Crosby
a5bb86caaa Merge pull request #11428 from vishh/parent-cgroup 
Adding '--cgroup-parent' option.
Upstream-commit: 455a272aef4e109ce57c20f9ea224e4d4b32ece7
Component: engine
 2015-03-19 14:41:57 -07:00
Lloyd Dewolf
b2e6c9b566 doc: reference/run introduce -it . 
Also:
- Fix "docker" cmd always "sudo docker" for docs.
- Fix "-ti" with "-it".
- fix "/docker" typo.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
Upstream-commit: 6ca1494f1932b66e042263999d8afd90e184ebf8
Component: engine
 2015-03-19 13:59:40 -07:00
Sebastiaan van Stijn
cacba6788c Optimize images 
Optimized new screenshots, reduced file-size with 50%

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cf0634b937264afd1194600f3719d35f29ac0440
Component: engine
 2015-03-19 10:01:43 -06:00
Jeff Anderson
cc2fb5cc3f Update docs around private github submodules in automated builds. 
Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 390dd4bf3f6e3c6b239d597467554a19b04dc89d
Component: engine
 2015-03-19 10:01:43 -06:00
J. Nunn
627077c4f9 Typo/grammar corrections to dockerizing.md 
Added commas where necessary, edited typos to improve readability.

Signed-off-by: J. Nunn <jeffnunn@amazon.com>
Upstream-commit: a8faba021c569a53f03ed68b27d2f53db2d70f3d
Component: engine
 2015-03-19 10:51:12 -05:00
Harald Albers
07ba863c0f Remove 'name' filter from docker events documentation 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ec7530afde3f45a31d51abe17f602a3c5dc6389e
Component: engine
 2015-03-19 08:51:36 +01:00
James Turnbull
a7ed4dc483 Merge pull request #11028 from jstangroome/patch-1 
Correct IP/MAC address generation docs
Upstream-commit: 33bec0a7f63695d6fa60a79c8732d49623d30223
Component: engine
 2015-03-19 01:44:43 -04:00
Vishnu Kannan
b21852214d Adding integration tests for --cgroup-parent feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c7267017e931cee8ecd0e8d88473f26a80a3314c
Component: engine
 2015-03-19 02:34:42 +00:00
Vishnu Kannan
8bcedc4b44 Adding documentation for '--cgroup-parent' option. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: f7dd1333b5a6dfa34ce8b2fb15533f1aca6efdc3
Component: engine
 2015-03-19 02:34:15 +00:00
Doug Davis
793cdf14d1 Merge pull request #11410 from cpuguy83/10191_build_resources 
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
 2015-03-18 21:44:21 -04:00
Brian Goff
5e80a64076 Allow setting resource constrains for build 
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
 2015-03-18 20:57:13 -04:00
moxiegirl
30161bd9a1 Merge pull request #11452 from jeffdm/master 
Adding Kitematic link to Mac OS X install instructions in docs
Upstream-commit: 068d343ddfad23ca2f7b407f5be03803029ac311
Component: engine
 2015-03-18 17:32:48 -07:00
Jeffrey Morgan
545bbe667a Adding Kitematic link to Mac OS X install instructions 
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com>
Upstream-commit: 3ddf5d75179f529356f19acb77e46e97388d4490
Component: engine
 2015-03-18 16:32:59 -07:00
Tibor Vass
47d9382364 Merge pull request #11430 from jfrazelle/export_outputflag 
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
 2015-03-18 19:04:43 -04:00
moxiegirl
ea8c209cf2 Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144 
Clarify behavior of docker cp
Upstream-commit: 50bf3cbedc923985868bd84515460aad174dcccb
Component: engine
 2015-03-18 08:46:52 -07:00
Sebastiaan van Stijn
b486ed31bd cleanup: docs: remove temporary inline styles 
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868).

This removes those temporary `<style>` tags.

depends on #11230 (https://github.com/docker/docker/issues/11230)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4e6a01023b7422dc3df7f02e248bb06361069fcc
Component: engine
 2015-03-17 22:48:28 +01:00
Mary Anthony
cf394b41e4 # This is a combination of 2 commits. 
# The first commit's message is:

Updating Ubuntu installation to use wget; eliminating elo

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

# This is the 2nd commit message:

Adding in James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f60ed98e79fbc91e7aa280769c62c5a59c7eba00
Component: engine
 2015-03-17 10:15:46 -07:00
moxiegirl
d3fdbf9469 Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882 
Return of the Ring: Metadata Labels Doc Tweaks
Upstream-commit: 2ab105e9fe604bb709dfaf25a19f4af003a8ddad
Component: engine
 2015-03-17 09:47:36 -07:00
Arnaud Porterie
90fc12f567 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
 2015-03-17 09:45:58 -07:00
Andy Goldstein
d6d379e87a Add ability to refer to image by name + digest 
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
 2015-03-17 10:10:42 +00:00
Joseph Kern
c16863b9b6 Modified docker export to allow an --output flag 
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added an --output flag to docker export and created tests.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added text to reflect a new output option for the export command.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Whitespace clean up

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added man page documentation for the new --output flag in export

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Upstream-commit: 5ff122f79713f177c07dbc43bb81f991243472d5
Component: engine
 2015-03-17 00:20:19 -07:00
Mary Anthony
43ac3e6d56 Updating with Sven's comments and other tweaks 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 6ddfe883dd0d6ce1f97a121652927ac1b1dbaefe
Component: engine
 2015-03-16 21:49:33 -07:00
Arnaud Porterie
5f00f97ea0 Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
 2015-03-16 20:20:05 -07:00
James Turnbull
6b3727b132 Merge pull request #11429 from tianon/eval-shellinit 
Add "eval" to every invocation of "boot2docker shellinit"
Upstream-commit: 97a5c584b3c917a5877012b2d4c1a00e5bb32479
Component: engine
 2015-03-16 21:19:50 -04:00
Jessie Frazelle
9d08a2eb1e Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference 
docs: use more tables in run reference and minor fixups
Upstream-commit: da24ba42e2717bb5d8765c8ba42cd4aeaa7a8ec6
Component: engine
 2015-03-16 18:02:42 -07:00
Michael Crosby
873a2edf47 Merge pull request #11210 from xuhdev/patch-1 
Update doc: "docker create" must specify a command
Upstream-commit: e6b18cb66d88e7b4f3762e74ee963c984185df33
Component: engine
 2015-03-16 17:43:17 -07:00
Tianon Gravi
1211b3d022 Add "eval" to every invocation of "boot2docker shellinit" 
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 200123b317cd1bad052d3c503278d03d712e4812
Component: engine
 2015-03-16 18:27:59 -06:00
Jessie Frazelle
df4aae20f1 Merge pull request #10723 from SvenDowideit/takeover-10653 
Update sample systemd for container
Upstream-commit: 44e9715e46db46d9c88b5bba6072c0fe42aa5837
Component: engine
 2015-03-16 17:18:57 -07:00
Jessie Frazelle
1bcf6f53fe Merge pull request #10816 from SvenDowideit/docker-build-return-code 
Add some information about the docker build return code
Upstream-commit: c7f5ee9d695f336ad2c273ceebdf2fe3257f673f
Component: engine
 2015-03-16 17:18:26 -07:00