daae801e4a
Merge pull request #11850 from kytrinyx/11796-git-mental-model
...
Clarify git instructions in project guide. Fixes #11796
Upstream-commit: 121de9e4e3e781a9f43edb1b062beef9f9a9d6db
Component: engine
2015-03-27 09:02:03 -07:00
1c9316a817
Merge pull request #11788 from reikani/pchoi
...
Changed snake case naming to camelCase.
Upstream-commit: da5c863d20df8c030b3ffc6c4e95f976ed162721
Component: engine
2015-03-26 23:55:50 -07:00
eb6bec8a3c
Clarify git instructions in project guide. Fixes #11796
...
The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.
I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.
Signed-off-by: Katrina Owen <katrina.owen@gmail.com >
Upstream-commit: 54c9ae187f5a3544881650c09e923d67ed229771
Component: engine
2015-03-26 19:24:14 -07:00
c6343683c9
Merge pull request #11846 from voltaic/master
...
Update set-up-dev-env.md
Upstream-commit: d2df901be3c5c964900de41286ba0c67aebfb5d1
Component: engine
2015-03-26 18:09:28 -07:00
34262a08d7
Merge pull request #11793 from lolilo/update-project-doc
...
fix typos, grammar, more concise wording
Upstream-commit: cd8ea1d17eff2424df6a63ef8de314e5724fd37a
Component: engine
2015-03-26 17:57:45 -07:00
29d7b5b844
Merge pull request #11841 from runcom/11762-replace-aliased-logrus-imports
...
Replace aliased imports of logrus
Upstream-commit: 756b8f2fde210da5529e0a5480e149917ab25524
Component: engine
2015-03-26 16:49:01 -07:00
99064ea4ea
Update set-up-dev-env.md
...
Signed-off-by: graycoder <patgray1127@gmail.com >
Upstream-commit: ddcb3ad061db518aa076422ed6d81a2247fb3a8e
Component: engine
2015-03-26 19:41:31 -04:00
ca8fb68336
Merge pull request #11813 from miminar/show-verified-status
...
Consider tag updated also in case repo does not exist
Upstream-commit: be5fd157d597b566f33de1bda19750313132239c
Component: engine
2015-03-26 16:29:13 -07:00
794638affe
Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix
...
term/winconsole: Identify tty correctly, fix resize problem
Upstream-commit: cf7104a0e853c453f08d052cb222b7071d4c27a2
Component: engine
2015-03-26 16:19:27 -07:00
44f1acd948
Merge pull request #11832 from jamiehannaford/patch-1
...
Fix spelling
Upstream-commit: 8c1118a8f92400d8e3847b9aa5fc12b25fd17def
Component: engine
2015-03-26 15:47:27 -07:00
1b99faf246
Merge pull request #11801 from hqhq/hq_fix_doc_for_exec
...
update docs for container exec
Upstream-commit: 296642035df602a788c042ae09573f65cd29b200
Component: engine
2015-03-26 15:31:16 -07:00
e5b36a723c
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
2015-03-26 23:22:04 +01:00
3dc8400325
term/winconsole: Identify tty correctly, fix resize problem
...
This change fixes a bug where stdout/stderr handles are not identified
correctly.
Previously we used to set the window size to fixed size to fit the default
tty size on the host (80x24). Now the attach/exec commands can correctly
get the terminal size from windows.
We still do not `monitorTtySize()` correctly on windows and update the tty
size on the host-side, in order to fix that we'll provide a
platform-specific `monitorTtySize` implementation in the future.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 0532dcf3dc1fa34fab5a9cdee6c4d87af66a6cdf
Component: engine
2015-03-26 15:11:28 -07:00
0913f2905d
Changed snake case naming to camelCase
...
Signed-off-by: Peter Choi <phkchoi89@gmail.com >
Upstream-commit: ae907e7af16136225417242ef5d55d3f6062fb3b
Component: engine
2015-03-26 15:05:45 -06:00
90483774e2
Merge pull request #11834 from jamiehannaford/contributor-guide-fix
...
Make gofmt use the filename previously referenced
Upstream-commit: 42f9594fd3b56fedfca5ceb38d7be568ff05a986
Component: engine
2015-03-26 12:41:53 -07:00
21101c3fb4
Make gofmt use the filename previously referenced
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 7fdf5257b4d4c94196303cba52b1882001d32754
Component: engine
2015-03-26 20:39:15 +01:00
0c72a7c4d1
Merge pull request #10050 from lindenlab/9922-private-registry-search-401
...
9922-fix: private registry search with auth returns 401
Upstream-commit: df90fb716bba00712563cc4816389c631e47ee78
Component: engine
2015-03-26 12:24:06 -07:00
e68fde69b6
Fix spelling
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 849e55f4e499f729e7e63ca2b20f3371a8e15d86
Component: engine
2015-03-26 20:24:01 +01:00
b58f7899ec
Merge pull request #11747 from moxiegirl/11694-remove-sudo-added-in-error
...
Proposal: Removing sudo from examples
Upstream-commit: dcc6e818febf8d3df2980dc474bc07c470f63e38
Component: engine
2015-03-26 15:18:48 -04:00
04f472f007
Fix for issue 9922: private registry search with auth returns 401
...
Signed-off-by: Don Kjer <don.kjer@gmail.com >
Upstream-commit: 6b2eeaf8965bac07022752c411b1f8a0f35f9571
Component: engine
2015-03-26 18:59:16 +00:00
e5276fe0a7
Removing sudo from command line examples
...
We now advise people to configure docker group and
add to sudo. Mac shouldn't use sudo. Removed sudo
from command examples. Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
2015-03-26 11:12:37 -07:00
d7de64918b
Merge pull request #11734 from yestin/11601-test-chrootarchive
...
Add more tests for pkg/chrootarchive
Upstream-commit: 6a43d71014788c88df647111330f75972aed9924
Component: engine
2015-03-26 11:03:58 -07:00
4d63ee40bb
Merge pull request #11766 from peggyl/11596-api-commands-godoc
...
Add godoc-style docstrings to Cmd... methods
Upstream-commit: 708ed9d87a5938e03abc019818ca2b42e2995482
Component: engine
2015-03-26 10:58:35 -07:00
0b6cf588fa
Merge pull request #11791 from moo-mou/11768-vetwarning
...
Fix vet warning
Upstream-commit: a196cc943ccb02a857c8509b6badb12e8e2071ac
Component: engine
2015-03-26 10:52:07 -07:00
3c5e5abec3
Merge pull request #11811 from VladimirAus/11585-3
...
#11585 : README for pkg/signal.
Upstream-commit: ec8f61044a7da10c5ddbf085c27afde4ea95c143
Component: engine
2015-03-26 10:44:09 -07:00
d81e78f3e1
Merge pull request #11821 from duglin/FixCPUTest
...
Fix TestBuildResourceConstraintsAreUsed Cpuset test
Upstream-commit: 5f295a6e8267f8759c38d4ba249f65ae5a5b0a5f
Component: engine
2015-03-26 10:42:43 -07:00
d294d535e9
Removing sudo from examples
...
We now have instructions in our Unix installs about setting up
docker group to avoid sudo. Also, Mac/Windows shouldn't use
sudo. So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: a4609a1dfbcfb2fea10aa2be15124e0809528d04
Component: engine
2015-03-26 10:13:19 -07:00
9ce3328aa4
Merge pull request #11800 from hqhq/hq_fix_create_issue
...
add back job.Errorf
Upstream-commit: 2bbf1987d2218f22e1df705c9bf1e0ce47a61faa
Component: engine
2015-03-26 11:12:55 -06:00
137e45c97e
Merge pull request #11786 from peggyl/golint-api-client
...
Fix golint errors for casing in api/client package
Upstream-commit: b9d19fdaef68681186411a8ab2024211dda409d6
Component: engine
2015-03-26 09:28:33 -07:00
db74987998
Merge pull request #11789 from parknicker/PostContainerWaitFix
...
Changes response of postContainersWait to use a struct
Upstream-commit: d4fca8047cc4b4b3bf21900c34169ee99cb17ad8
Component: engine
2015-03-26 08:40:00 -07:00
d90880d842
Merge pull request #11702 from jimmypuckett/feature/bitflag_checking_style_11668
...
Feature/bitflag checking style 11668. Fixes #11668
Upstream-commit: dd492dc15d462aee110e4d6df6297ad64c5fad56
Component: engine
2015-03-26 08:34:58 -07:00
d4e188856d
Fix TestBuildResourceConstraintsAreUsed Cpuset test
...
Set cpuset to "0" so that it works on single core machines.
W/o this (and set to "1") we'll see something like this error
when running:
System error: write /cgroup/cpuset/docker/66689499bbd08cd8dccc9b7bfd1d6b34e85d73ce8c84d3c69b5e91944322da60/docker/79d7c548b58c85c4cfad6cd01eb7c3b30db254d1014c496137edd93ddc528a6f/cpuset.cpus: invalid argument"
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 389d0ae45327926a9d20b2a3e6c15499f3c9c570
Component: engine
2015-03-26 07:31:39 -07:00
d43cf4b5b0
Merge pull request #11806 from aneshas/11770-redundant-err-nil-check
...
Removed redundant err == nil check
Upstream-commit: afc8ae939aabf0e9e348ae62624a1740c8607508
Component: engine
2015-03-26 10:07:40 -04:00
ed7e44e788
Consider tag updated also in case repo does not exist
...
This patch causes `The image you are pulling has been verified` status
message to be produced also when the repository is pulled for the first
time.
Signed-off-by: Michal Minar <miminar@redhat.com >
Upstream-commit: 3b8d4bb82ba6abf728cd40c838bfd665f8d10639
Component: engine
2015-03-26 12:52:56 +01:00
517a83c6d1
#11585 : README for pkg/signal. Signed-off-by: Vladimir Roudakov <v_roudakov@yahoo.com>
...
Signed-off-by: VladimirAus <v_roudakov@yahoo.com >
Upstream-commit: 9b876b9c03f3ab5c2fecc5bc7a1501970f487b2a
Component: engine
2015-03-26 21:18:27 +10:00
b5975ff15e
Removed redundant err == nil check
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
Upstream-commit: b38e11b3c4a84e35bfd76bff8133a5338cd69423
Component: engine
2015-03-26 11:36:13 +01:00
f182e61c8b
update docs for container exec
...
https://github.com/docker/docker/pull/11665 This PR changed container
exec API response, we need docs updated.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: fabb5114d808d127436121d28e320fd065f30865
Component: engine
2015-03-26 13:55:46 +08:00
b6ee273588
add back job.Errorf
...
c79b9bab54167 (Remove engine.Status and replace it with standard go error)
cause a regression that create container won't get any warnings, we still
need this to send useful informations to user.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 40ef253ef516a82d4a3d1cf23f7d3bee2a08bc4f
Component: engine
2015-03-26 13:12:36 +08:00
b9013b315f
Merge pull request #11794 from moo-mou/11790-pkgulimit
...
Fixes pointer error
Upstream-commit: bc0f1e0e098d49fff458679001fe4e2ae58c03d7
Component: engine
2015-03-25 21:30:37 -07:00
7938582b08
fixes comment for ContainerWaitResponse struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com >
Upstream-commit: 89d63d2a82e9a4c20696e9e93736a99a10be6c91
Component: engine
2015-03-25 22:22:58 -06:00
7830df3aef
Merge pull request #11795 from grubernaut/net_none_test_fixes
...
Add fixes for integration-cli tests w/ --net none
Upstream-commit: 191f88dd2cc30b03daaf79366dd9d6fbdcd3049e
Component: engine
2015-03-25 21:22:28 -07:00
e32695a057
Merge pull request #11781 from xamyzhao/patch-1
...
Updated step 5 with Windows instructions so that installation works in W...
Upstream-commit: ff2fc9757de5661188d09bef9804c904d8910092
Component: engine
2015-03-25 23:51:35 -04:00
0dfca0423d
Merge pull request #11468 from robertabbott/10959-refactor-progressreader-hack
...
Fixes hacks from progressreader refactor
Upstream-commit: 23699f5a29ebc166fbf05e0b093725b2bda31ed7
Component: engine
2015-03-25 23:50:43 -04:00
35acd2c3eb
Add fixes for integration-cli tests w/ --net none
...
Adds network to integration tests that were failing without network.
Fixes #10964
Fixes #10968
Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com >
Upstream-commit: c2fe26243906ad2641876e877d23a419bb4bdb75
Component: engine
2015-03-25 23:46:04 -04:00
e193f3caea
Fixes pointer error
...
Signed-off-by: Paul Mou <ppymou@gmail.com >
Upstream-commit: 273fdd97edec3ad758dbf94e8268fd57512cee02
Component: engine
2015-03-25 20:45:17 -07:00
8f2d65bf21
Fix vet warning
...
Signed-off-by: Paul Mou <ppymou@gmail.com >
Upstream-commit: c5bf2145f172a264d3d8fc63d6717826b95b5ee2
Component: engine
2015-03-25 20:31:02 -07:00
953cdb72ca
Update CmdCommit docstring and fix CmdHelp whitespace
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: 2a5a402c717fa0ff05b7e57e85bf3388ba1ee1a5
Component: engine
2015-03-25 20:07:00 -07:00
9cc2619bdf
fix typos, grammar, more concise wording
...
Signed-off-by: Liana Lo <liana.lixia@gmail.com >
Upstream-commit: 4982374739a37e349b82ab168fb2f43a55f3287c
Component: engine
2015-03-25 20:03:42 -07:00
bfdce6caee
Changes response of postContainersWait to use a struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com >
Upstream-commit: 1bc266dfa714f097cc9babf2f0c771566388d47b
Component: engine
2015-03-25 21:01:14 -06:00
738874a52d
Fix golint errors for casing in api/client package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: a465e26bb05083c247ba74e1092338c43c76be47
Component: engine
2015-03-25 19:54:29 -07:00
