Commit Graph

13332 Commits

Author SHA1 Message Date
56f9de6d23 Merge pull request #10926 from cpuguy83/10685_check_nil_volume
Check nil volume on mount init
Upstream-commit: ae9001fbdc251a455a7e59475b2a40b54d2fbd96
Component: engine
2015-02-23 13:55:38 -08:00
1c2ec47a40 Merge pull request #10954 from icecrime/update_release_checklist
Update RELEASE-CHECKLIST.md
Upstream-commit: 83bf0ac96d0ce41c4f74735a7a17a71641f7ac2f
Component: engine
2015-02-23 12:20:04 -08:00
8cccb488d5 Merge pull request #10951 from tianon/fix-dynbinary
Fix dynbinary with new autogen code
Upstream-commit: 3562997296a8ba3538390afdffcc531da62ab598
Component: engine
2015-02-23 12:08:17 -08:00
216293ecdf Merge pull request #10887 from lkinley/master
Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
Upstream-commit: acda41e7c3999d1aca0a3298f87e219873fb2f4e
Component: engine
2015-02-23 11:43:12 -08:00
55586c529d Update RELEASE-CHECKLIST.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: d1b515dcc5a2a57610aaab54a27fbee321d355d1
Component: engine
2015-02-23 11:34:22 -08:00
6e5fd6595f Fix dynbinary with new autogen code
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a936ea88dab9751250a51b6e32ee4e7aa57d8e9d
Component: engine
2015-02-23 11:19:51 -07:00
7e8d8b3922 Merge pull request #10698 from crosbymichael/issue-triage
Add issue triage document
Upstream-commit: e82cf741e3d1cf0990836ea1112ff6e1edfa680f
Component: engine
2015-02-23 10:18:04 -08:00
d3f0aa2c72 Merge pull request #10945 from delftswa2014/daemon-rm
Rename Daemon.Destroy to Daemon.Rm to be consistent with CLI command.
Upstream-commit: 05ba127f060a1e9fee819e15bef300d56ddda1cf
Component: engine
2015-02-23 09:22:58 -08:00
a23c3ea95a Rename Destroy to Rm to be consistent with CLI.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: ba93f8316ce796ebeee62f704f8311af8b9f250a
Component: engine
2015-02-23 16:15:56 +01:00
f1c26b077c Merge pull request #10918 from cpuguy83/10278_fix_create_docs_for_volumes
Remove CLI doc entry related to API-only function
Upstream-commit: 7d2188f9955d3f2002ff8c2e566ef84121de5217
Component: engine
2015-02-22 18:11:18 -08:00
654aabd54a Merge pull request #10927 from hyp3rdino/patch-1
Update mac.md
Upstream-commit: bac58e971104bf375bf241913747e1d98dadf2cf
Component: engine
2015-02-22 20:39:53 -05:00
cd135d371f Merge pull request #10930 from caryhartline/patch-1
Fix three spelling mistakes
Upstream-commit: 74394f03ac422fe79c049f37c469fdceac078ff7
Component: engine
2015-02-22 20:28:42 -05:00
7735397fed Merge pull request #10942 from sdreyesg/patch-1
"docker run hello-world" instead of "docker hello-world"
Upstream-commit: e8484a34385d8e3652f820dd4be89e4b9c4b72d1
Component: engine
2015-02-22 20:28:19 -05:00
45c1ee2250 Merge pull request #10941 from dottorblaster/master
New padding-right for the docs' left navigation
Upstream-commit: c23d0805bb6827c38a3f4f973b0d2592f19d2532
Component: engine
2015-02-22 20:27:55 -05:00
95592a5ea0 Update mac.md
I just tried this guide. I had to use "docker run hello-world" instead of "docker run"

Signed-off-by: Dario Galvis <sdreyesg@gmail.com>
Upstream-commit: f37351f9e88e077b2a1b219cd412e781ebb2ef9c
Component: engine
2015-02-22 14:51:32 -08:00
98b2a68b5d correcting a little visual bug
padding right: 10px; for #leftnav li

Signed-off-by: Alessio Biancalana <dottorblaster@gmail.com>
Upstream-commit: 47a847bca8aa91f55c6b18c726bd4a6d960322d1
Component: engine
2015-02-22 22:59:41 +01:00
2e2ad7fccb Fix three spelling mistakes
There are three instances of "boo2docker" that should be changed to "boot2docker".

Signed-off-by: Cary Hartline <varmateo@icloud.com>
Upstream-commit: 4c7d41ac180bba52bf567515bf9f033ecfa70de7
Component: engine
2015-02-22 14:47:39 -06:00
27f86812ca Update mac.md
'docker hello-world' is not a docker command. 'docker run hello-world' is correct.

Signed-off-by: Markus Kortlang <hyp3rdino@googlemail.com>
Upstream-commit: 29b62053c45e2a608748c0beb5e240f653b27062
Component: engine
2015-02-21 19:25:37 +01:00
c3fb546053 Check nil volume on mount init
Fixes #10685 panic in some cases.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7122b6643e4124db3d37b3b46f4741a97ba03611
Component: engine
2015-02-21 07:21:57 -05:00
9de48f55f2 Merge pull request #10439 from estesp/10426-fix-arg-list-too-long
Pass excludes/options to tar unarchiver via environment versus cmd line
Upstream-commit: f207dd5e7c3a99b1f26014a575197e8b9cc41ed8
Component: engine
2015-02-20 23:48:55 -08:00
113975c3ee Merge pull request #10909 from ahmetalpbalkan/run_test-defer
integration-cli: Better test cleanup with defer
Upstream-commit: b062ef05e59ecfc0c08dccdea3d81c024c491350
Component: engine
2015-02-20 17:28:08 -08:00
7e28069bae Merge pull request #10871 from ahmetalpbalkan/win-cli/TestBuildAddBadLinks-fix
integ-cli: Fix TestBuildAddBadLinks for windows
Upstream-commit: 4ba1128c1857e8c8d3dbbee63b50b600a2d9aed7
Component: engine
2015-02-20 17:27:36 -08:00
4ab4d22713 Merge pull request #10865 from ahmetalpbalkan/win-cli/tar-path
pkg/archive: Canonicalize stored paths
Upstream-commit: 1d382f9c2d368adfea5b12316e3836ec82bd8d81
Component: engine
2015-02-20 17:20:51 -08:00
36ad91a3b2 Merge pull request #10844 from ahmetalpbalkan/win-cli/TestBuildDockerfileOutsideContext-path-improvement
integration-cli: pass platform-compatible paths to os.Symlink
Upstream-commit: 5919f1b16c67041abc804f34872f3f4446370b35
Component: engine
2015-02-20 17:19:37 -08:00
dc69751f14 Add issue triage document
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 828e76a5aa8742661e8b7ee9603ce7166e90a34c
Component: engine
2015-02-20 17:19:08 -08:00
0f72ec16db Better test cleanup with defer
This fixes a few misuses of `deleteAllContainers()` cleanup
method in integration-cli suite by moving call to the
beginning of the method and guaranteeing their execution
(including panics) with `defer`s.

Also added some forgotten cleanup calls while I'm at it.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 70407ce40ca98d763da8472e7ee94b6e8d66912d
Component: engine
2015-02-20 14:04:36 -08:00
1269363ae7 integ-cli: Fix TestBuildAddBadLinks for windows
TestBuildAddBadLinks used to build a path by
concenating unix-style forward slashes. Fixed that
by providing a windows-equivalent using `runtime.GOOS`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: d0dc14e5d6fe5f8ef9d4a8a8dc95fa087439a5b4
Component: engine
2015-02-20 13:24:59 -08:00
cc62780e08 Merge pull request #10900 from moxiegirl/connection-reset-by-peer-faq
Adding info to faq per customer problem.
Upstream-commit: f70567e9a9a8c086f798f2c3b00f93ad1ae40b15
Component: engine
2015-02-20 13:20:28 -08:00
190cc5a491 Merge pull request #10838 from moxiegirl/mac-update
Adding in updates for Mac for upcoming events
Upstream-commit: aa057fd3b3f3a2817f01f834482c396cf08ce53d
Component: engine
2015-02-20 13:10:29 -08:00
89b66e14e3 integration-cli: pass platform-compatible paths to os.Symlink
Although this doesn't fix the test (os.Symlink is not yet
implemented for Windows), this prevents unix-style paths
from being passed to os.Symlink. Also makes code cleaner
for linux.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4581240e585d5188955507fbd1de1affcd2ffc1b
Component: engine
2015-02-20 12:25:10 -08:00
2d2518d506 Merge pull request #10833 from fabianorosas/10832-fix-test-unit-without-parallel
Fix test-unit run without parallel
Upstream-commit: f2d2862459ee501bafec2b0f33e52ae849dd7993
Component: engine
2015-02-20 12:12:46 -08:00
b0931cf1a2 Merge pull request #10888 from dougm/parallel-load
Avoid parallel layer downloads in load command
Upstream-commit: 15bf67a998965fad9e457b05b18034be10117871
Component: engine
2015-02-20 11:01:40 -08:00
5330278b47 Merge pull request #10730 from mattyw/fix-10728
api/server: don't print warning if serving on localhost
Upstream-commit: 4cc8ccb8d2635aaff5cf8525f2f83b5211259579
Component: engine
2015-02-20 10:43:56 -08:00
868befad3f Merge pull request #10913 from ahmetalpbalkan/win-cli/UnixSpecific-skip
integ-cli: Skip some unix-specific cli tests
Upstream-commit: 695bf3348f022e12c2d7deb21f8f3a088c079e89
Component: engine
2015-02-20 10:33:28 -08:00
340738a112 Merge pull request #10914 from kargakis/map-commands
Map Commands instead of using them as a slice
Upstream-commit: c5aca86654f9eeb07e533ece53da139aad692b2b
Component: engine
2015-02-20 10:32:04 -08:00
dd211e62ee Fix export of BUILDFLAGS in test-unit. Closes #10832
Signed-off-by: Fabiano Rosas <farosas@br.ibm.com>
Upstream-commit: ab6ae7215eab36a21c9f1c286b9e157f6b644edc
Component: engine
2015-02-20 16:25:10 -02:00
b51836333b Merge pull request #10625 from duglin/FixHelpHomeSlash
Fix for help when $HOME is /
Upstream-commit: fdfa7ee70286c3d08a839e20ea7663185cdbcd78
Component: engine
2015-02-20 10:06:22 -08:00
3f76171b24 Merge pull request #10665 from brahmaroutu/autogen_removeXflag
Removing -X flag option and autogenerating code to create Dockerversion....
Upstream-commit: b32564798df90222fd455a6db52a61f9b4ae2100
Component: engine
2015-02-20 09:53:07 -08:00
117a5aaace integ-cli: Typo fix in test_vars_* comments.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 5d615dff10f31ea6bf77a1233b1821b0e525e456
Component: engine
2015-02-20 09:51:10 -08:00
105231e146 integ-cli: Skip some unix-specific cli tests
Skipping some of the tests closely tied to running in a
unix environment. Windows does not support chmod/chown
and this causes some tests to fail creating desired
behavior.

- `TestBuildWithInaccessibleFilesInContext`: uses chown/chmod
- `TestBuildDockerfileOutsideContext`: uses os.Symlink, not implemented on
  windows
- `TestCpUnprivilegedUser`: uses chmod, and requires 'unprivilegeduser'
  created by Dockerfile (and thus requires to run inside container)
- `TestBuildChownSingleFile`: uses chown

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 492a58f05fe026653e27ed75d3ad4221f2e615b1
Component: engine
2015-02-20 09:51:10 -08:00
1dea2eba06 Merge pull request #10911 from ahmetalpbalkan/win-cli/TestVolumesNoCopyData-fix
integ-cli: fix volume test by passing unix path as volume
Upstream-commit: b1509e868555abaa6cdc97c56f6b82d845f70a2e
Component: engine
2015-02-20 09:21:47 -08:00
85de285604 Remove CLI doc entry related to API-only function
Closes #10278

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4f0429621c7e6ccaac8bc9a62a703bf68f2d4cd4
Component: engine
2015-02-20 11:51:42 -05:00
941e43ab12 Merge pull request #10916 from chenhanxiao/commands-comment-typo
commands: fix a comment typo
Upstream-commit: b3052b0fca571683fdfc7328152239ebb9a35f4e
Component: engine
2015-02-20 08:29:21 -08:00
34debd5101 commands: fix a comment typo
s/overide/override

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 0050efcd8f82144ea7f6c74f9bc9af357743370d
Component: engine
2015-02-20 23:46:29 +08:00
314f2be995 Map Commands instead of using them as a slice
The most obvious use case is when one wants to make sure as fast
as possible that a command is a valid Dockerfile command.

Signed-off-by: kargakis <kargakis@users.noreply.github.com>
Upstream-commit: 6ecf23861ec7036aa4210fe6d3b7dbfaaedbd6d0
Component: engine
2015-02-20 15:56:21 +01:00
1b9876efb2 integ-cli: fix volume test by passing unix path as volume
This fixes `TestVolumesNoCopyData` for test execution on
windows by passing a unix-style path as volume even though
it's running on windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 606283875616bf71af4814fc47ee5c2ca7b729c6
Component: engine
2015-02-20 00:58:44 -08:00
efffe9523d Fix for help when $HOME is /
estesp noticed that when $HOME is / the ~ substitutions messes up
becuase it tries to replace all paths that start with "/" with "~".
This fixes it so that it will only replace it when $HOME isn't "/".

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 116367eb07351125754aef01f7d3da152b018710
Component: engine
2015-02-19 22:21:17 -08:00
f634216d52 Removing -X flag option and autogenerated code to create Dockerversion.go functionality
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6871b9b16afe46e7566ac2937246b4a64be97269
Component: engine
2015-02-20 05:40:12 +00:00
05600313fd api/server: don't print warning if serving on localhost
Fixes bug #10728

Signed-off-by: mattyw <gh@mattyw.net>
Upstream-commit: 0ae455333b3357f30f27da10557e4d9c006b5ba7
Component: engine
2015-02-20 12:37:17 +08:00
7b25cb1708 Merge pull request #10872 from jfrazelle/ugh-tomlv
fix tomlv because it doesn't read from stdin
Upstream-commit: a78ce5c228b895d8c614d72354a52e324817b9fc
Component: engine
2015-02-19 20:31:34 -08:00