1
0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Commit Graph

8920 Commits

Author SHA1 Message Date
Victor Vieux
5490b8933d Merge pull request #6489 from vieux/fix_mflags_panic
prevent panic when empty flag
Upstream-commit: 3336bdf5b5ac9753df549a8434de820c06260a65
Component: engine
2014-06-17 14:04:20 -07:00
Michael Crosby
a1e9b8d6d0 Merge pull request #6405 from gsalgado/migrate-test-getcontainersbyname
Convert TestGetContainersByName into a unit test
Upstream-commit: ba4ae2c46d0ea77eecb05b2b01405dbeffafc58b
Component: engine
2014-06-17 14:01:42 -07:00
Tibor Vass
da13f8faf7 Merge pull request #6485 from crosbymichael/update-libcontainer
Update libcontainer dependency to 77ffd49dfedbc78a
Upstream-commit: 092826152cdfcb125bafdf5c9fed911e304feccf
Component: engine
2014-06-17 16:57:35 -04:00
Victor Vieux
928e8a4f4b Merge pull request #6471 from LK4D4/more_buildfile_tests_to_cli
Move more buildfile tests to integration-cli
Upstream-commit: c7fdd51eb6407fba41200e7a14f652519b179b71
Component: engine
2014-06-17 13:54:55 -07:00
Victor Vieux
2883b4234a prevent panic when empty flag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 661a1e90263cc348c17620cf0b250bf552dd4056
Component: engine
2014-06-17 20:45:57 +00:00
Michael Crosby
e3f7ac181c Update libcontainer dependency to 77ffd49dfedbc78a
Fixes #6256
Fixes #6383
Fixes #6414

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 698ded75b9aa076f4278398e56fa95e90e900d2b
Component: engine
2014-06-17 13:09:36 -07:00
Alexandr Morozov
017a78b3c1 Move TestBuildAddToSymlinkDest to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: cc42eeac21caa962bed94878fe2eab00735cd00d
Component: engine
2014-06-17 23:44:30 +04:00
O.S. Tezer
551ab6b3bc Merge pull request #6356 from mattyw/master
fixed a broken link in the readme
Upstream-commit: 52edbe6a23f3c052d19aedccc5efb6571bfc24f8
Component: engine
2014-06-17 11:00:46 -07:00
mattyw
c38b2639f5 fixed a broken link in the docs
Docker-DCO-1.1-Signed-off-by: Matt Williams <lp@mattyw.net> (github: mattyw)
Upstream-commit: d4ec4d6e9b273bfc6a1f0e88edcddcd9e742bbab
Component: engine
2014-06-17 18:36:59 +01:00
James Turnbull
d413b71710 Merge pull request #6470 from adelton/dns-no-hostname
The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
Upstream-commit: bf9482987f55d60c50fdf70525d20fd8ddd10e5e
Component: engine
2014-06-17 10:13:12 -05:00
James Turnbull
fcec122617 Merge pull request #6473 from leeplay/userguide
fix missing TAG for docker run 
Upstream-commit: 0ba7f934ee0fb3bf0953b1456792443e7faf0921
Component: engine
2014-06-17 06:23:06 -05:00
James Turnbull
13cfd39f56 Merge pull request #6469 from mariusv/patch-1
fixed Automated Build page link
Upstream-commit: 087acccf0ca8d43b7a9181961035f765dceafb5b
Component: engine
2014-06-17 06:16:35 -05:00
kyu
8d4f489b58 fix wrong command
Upstream-commit: cac97b6bd86fb3b741ff3ce75cf422ef378854b9
Component: engine
2014-06-17 17:49:34 +09:00
Jan Pazdziora
2ef780f316 The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)
Upstream-commit: e278082c213d887322270eefb96fda6d76a082c0
Component: engine
2014-06-17 09:40:59 +02:00
Alexandr Morozov
f48cbf9c53 Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 690711b5840be388fb13fb72856de337bdf645c7
Component: engine
2014-06-17 11:39:47 +04:00
Alexandr Morozov
3ac290e972 Move TestBuildOnBuildForbiddenFromTrigger to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1c8ec01c551b3cfac8548d7fd22a50b3c236e362
Component: engine
2014-06-17 11:36:45 +04:00
Marius Voila
a96755d882 fixed Automated Build page link
Corrected the link in the Automated Builds page from  https://registry.hub.docker.io/builds/ to https://registry.hub.docker.com/builds/ as the *.io is not working
Upstream-commit: 2ed8b220998c11a0580adb10dc8647864748522a
Component: engine
2014-06-17 08:24:56 +01:00
Alexandr Morozov
17786f89f8 Move TestBuildOnBuildForbiddenChainedTrigger to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1e0e86360f8fefbeb3d70642aa0402bcb0c97a1a
Component: engine
2014-06-17 11:24:47 +04:00
Alexandr Morozov
417be2b8be Move TestBuildOnBuildTrigger to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 2629e2ec236a377973e7be296013e366b4074d44
Component: engine
2014-06-17 11:14:45 +04:00
Alexandr Morozov
0c3b5a8a2c Move TestBuildFailsDockerfileEmpty to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 08a10f936b4b5a69d3be6d320499c025a399fddb
Component: engine
2014-06-17 11:06:44 +04:00
Alexandr Morozov
85c70b022e Move TestBuildFails to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: d3023f25f5c9e1173fe1cf1dbb449a926dc85cfd
Component: engine
2014-06-17 11:06:40 +04:00
Alexandr Morozov
285461876d Move TestBuildInheritance to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: f1d7ed35bd17c5e8e8f4d1882b5e98ae5419e9f1
Component: engine
2014-06-17 11:05:45 +04:00
Alexandr Morozov
fd55280b29 Move TestBuildADDFileNotFound to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 62d97afaf8d328b42c028323f10c3f4782f03561
Component: engine
2014-06-17 11:05:36 +04:00
Alexandr Morozov
f7987f5c93 Move TestForbiddenContextPath to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 686786f107582c27c69a6f40655c8fc52a8e4d00
Component: engine
2014-06-17 10:38:45 +04:00
Alexandr Morozov
f81562b040 Move TestBuildEntrypointRunCleanup to integration-cli
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c5b82f5e8dd5c519330e02502e5b9f9031a6509a
Component: engine
2014-06-17 10:16:36 +04:00
Guilherme Salgado
6e1924abe9 Convert TestGetContainersByName into a unit test
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
Upstream-commit: c44c98edec6822edf17cc969038e21be6ccdbd93
Component: engine
2014-06-17 07:56:57 +02:00
O.S. Tezer
35f7ca64f8 Merge pull request #6464 from SvenDowideit/pr_out_exclaimation_marks_cause_shell_pain_simplify_it_away
exclaimation marks cause shell pain - simplify it away
Upstream-commit: da327c8fa361affa2c453bf1c103b8120f4ba059
Component: engine
2014-06-16 18:13:24 -07:00
SvenDowideit
53933481a7 exclaimation marks cause shell pain - simplify it away
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 21849f1a2149660005d465376d055924b6ab887a
Component: engine
2014-06-17 10:49:23 +10:00
Sven Dowideit
a2e83ee654 Merge pull request #6462 from SvenDowideit/pr_out_fixup_small_formatting
fixup small formatting
Upstream-commit: 5e8402568e9d3cc2c7c3bb6c9c10d6a1ec5bd0d8
Component: engine
2014-06-17 10:41:58 +10:00
SvenDowideit
fa879cab42 fixup small formatting
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7e9fbbba1ca4682d3645c410636dc7c78d38c769
Component: engine
2014-06-17 10:39:12 +10:00
Richard Harvey
22dd81c469 Updated Viewing App when on OSX
Added section to show how to get IP address and view running python app if the user is using boot2docker on OSX

Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com> (github: richarvey)

Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com> (github: SvenDowideit)
Upstream-commit: 2c5405f699c308eee0cfc87ec6dd8aa3bce1b2ef
Component: engine
2014-06-17 10:39:11 +10:00
Sven Dowideit
28dcd27f99 Merge pull request #6438 from jamtur01/opts
Fixed DOCKER_OPTS
Upstream-commit: b3e80c6935b0565cb1fafee6311a0de9abf23212
Component: engine
2014-06-17 10:16:07 +10:00
Michael Crosby
f812414977 Merge pull request #6417 from mrunalp/dev/system_prctl
Add helper function to make prctl system call.
Upstream-commit: 742d8bf922976dbf6371f198e7c6ad3b55286c90
Component: engine
2014-06-16 17:13:06 -07:00
Sven Dowideit
c4f9cd6161 Merge pull request #6240 from pmorie/docs
Add ApiVersion to doc example for remote API 1.12 /version
Upstream-commit: 8f6162f17ba6684641312526b2bfd8b39607b714
Component: engine
2014-06-17 09:21:21 +10:00
Sven Dowideit
10692d0667 Merge pull request #6306 from mheon/fix_manpage_issue
Update documentation for docker pull
Upstream-commit: d5f7b4df1b96a49fe1523daec48a01f2c1cafa3e
Component: engine
2014-06-17 09:13:29 +10:00
Sven Dowideit
2ebe66f88a Merge pull request #6459 from ostezer/issue-5036-main-nav-top-level-click
Issue #5036 -> Click on nav bar goes to top level doc
Upstream-commit: 95ca361df6b1c2aab3fb8edd19a81ab6b1ad0138
Component: engine
2014-06-17 09:08:37 +10:00
Sven Dowideit
833bf1f98e Merge pull request #6449 from timthelion/host-net-docs
Document the potential insecurity of --net host
Upstream-commit: 4e2cf53f4fe39aac24ad23c02664daf8bf4fb568
Component: engine
2014-06-17 09:06:27 +10:00
Victor Vieux
4d16453ae7 Merge pull request #6430 from LK4D4/lock_inspect
Do inspect under container lock
Upstream-commit: d671768b52a43f27755d10245917103dea6b7416
Component: engine
2014-06-16 15:31:08 -07:00
James Turnbull
272c2bda69 Merge pull request #6458 from ostezer/docs-code-block-scrolling
Issue #5279 -> Introduce horizontal scrolling to code-blocks
Upstream-commit: 69a1f53e701755146fec838269fe015fb237c593
Component: engine
2014-06-16 16:14:17 -05:00
O.S. Tezer
0701888e65 Issue #5036 -> Click on nav bar goes to top level doc
Closes issue #5036

This commit redirects the reader to top level doc upon clicking
on a main nav. menu item (eg. Installation [click] -> Mac OS X)

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 8ae966de75fade55da5e34bd65b83c8ceb27346b
Component: engine
2014-06-16 13:51:56 -07:00
Timothy
4c39400bd1 Document the potential insecurity of --net host
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: ed5054389aa7cd0456bfdf1d940d3cdad0313f8f
Component: engine
2014-06-16 20:40:07 +00:00
O.S. Tezer
5a4f568984 Issue #5279 -> Introduce horizontal scrolling to code-blocks
Closes issue #5279

This commit re-introduces horizontal scrolling to docs' codeblocks

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 7a7bb43db5ecea4dd08af016a2528d0722bf79ac
Component: engine
2014-06-16 13:29:20 -07:00
Matthew Heon
65a88a1593 Updated CLI documentation for docker pull with notes on specifying URL
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 03ae463c8d77dd8d10e9fd9e37d984896ef9247e
Component: engine
2014-06-16 15:58:05 -04:00
Tianon Gravi
203a0f3ec5 Merge pull request #6425 from tianon/fix-man-page-spelling-errors
Fix several man page spelling errors
Upstream-commit: a6ce867e48cdfaafdca7344bd2df9c29cdd20cbe
Component: engine
2014-06-16 13:24:10 -06:00
Matthew Heon
0bc0d4e474 Updated docker pull manpage to reflect ability to specify URL of registry.
Also fixed a typo in same file.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: aab9078ff976c1ee7413a6cfc1b9d6424c3581fd
Component: engine
2014-06-16 15:13:47 -04:00
James Turnbull
bee288d0b6 Merge pull request #6304 from glyn/mac-build-no-sudo
Do not build using sudo on Mac OS X
Upstream-commit: 4e20407d8260657bc823d6d02120972d718222b3
Component: engine
2014-06-16 09:45:52 -04:00
Glyn Normington
26c642c4fd Do not build using sudo on Mac OS X
Building using sudo fails on Mac OS X, but is necessary on Linux.

See https://groups.google.com/d/topic/docker-dev/1EW_pfA1t9o/discussion for discussion.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Upstream-commit: 1c05ddd645c50102321274ec7595c8b62dd71335
Component: engine
2014-06-16 14:39:48 +01:00
Solomon Hykes
364b810e97 Merge pull request #6448 from shykes/pr_out_guillaume_is_busy_full_time_on_his_new_business_and_no_longer_available_as_a_maintainer
Upstream-commit: f83c873d8b0d4327e7f8909ba6a096acf2769c17
Component: engine
2014-06-16 06:25:19 -07:00
Solomon Hykes
76dc816a6e Guillaume is busy full-time on his new business, and no longer available
as a maintainer.

Best of luck on your e-commerce business Guillaume, and thanks for all
the great contributions!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 41d437117d13d445192b92a93955dec5c012512c
Component: engine
2014-06-16 06:22:15 -07:00
James Turnbull
86dabfb5d3 Merge pull request #6443 from catharsis/patch-1
dockervolumes: Fix a minor typo
Upstream-commit: 7085ec875fbfe927e555d1bdc485654682d698ab
Component: engine
2014-06-16 09:09:32 -04:00