5bc802bd5b
Merge pull request #11906 from runcom/11905-refactor-utils-tmpdir
...
Refactor utils/tmpdir.go
Upstream-commit: a2ea4a9d9de48eebbeeb80acfdc6ce82f6052365
Component: engine
2015-03-30 08:58:51 -07:00
8b07e2892d
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 08331294bcabf90ce3d22dca729f206912d2a752
Component: engine
2015-03-30 08:31:46 +08:00
342d42b5a5
Refactor utils/tmpdir.go, fixes #11905
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: f1bbc1f34f98529f352130b5985ae5763e5b9c2e
Component: engine
2015-03-29 20:56:07 +02:00
0544f5e034
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
2015-03-28 09:07:20 +08: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
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
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
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
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
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
f2b849a215
running code formatter as @tiborvass requested
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
Upstream-commit: 5dde99163e7674814f2d9be0bc22c9618fa70b89
Component: engine
2015-03-25 19:24:55 -04:00
9d3f3b6126
Merge pull request #11772 from aneshas/11718-redundant-else
...
Fixed redundant else
Upstream-commit: 89e7f5e6611e6237482d986777a3451034f7e4c0
Component: engine
2015-03-25 16:16:16 -07:00
d222ef85ca
Fixed redundant else
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
Upstream-commit: 3d7b9e8f30a48bc2e929d8ac3d82f70778e99b59
Component: engine
2015-03-25 23:44:32 +01:00
a16f3d6cb4
Remove engine.Status and replace it with standard go error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c79b9bab541673af121d829ebc3b29ff1b01efa2
Component: engine
2015-03-25 22:32:08 +01:00
a9e8a0831a
Merge pull request #11691 from matthewkmayer/feature-dont-create-bind-dirs
...
Removes bind dir creation in daemon start.
Upstream-commit: 54a607a22d625a06fabf604053748f708afc4d94
Component: engine
2015-03-25 11:44:13 -07:00
b18a43073b
btrfs: #ifdef for build version
...
We removed it, because upstream removed it. But now it will be coming
back, so work with it either way.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: b76e300b4cd6ce4446170c7170a2734f7994a6c1
Component: engine
2015-03-25 13:56:51 -04:00
5d59835e1f
Merge pull request #11750 from MabinGo/adjust_log_func_call
...
Use appropriate func to record logs according to different scene
Upstream-commit: 444c967aece4ef021aefe209a067c5d94ceb817e
Component: engine
2015-03-25 09:41:41 -07:00
94d3e5ce63
Use appropriate function to record logs
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: b46beb170fda938c373a67671919c587aeda92db
Component: engine
2015-03-25 23:32:12 +08:00
ac917d33bd
Fixed redundant else in GetDeviceStatus
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
Upstream-commit: e479e1c9f7d327f396eebc46d446cf4ee34513f7
Component: engine
2015-03-25 09:53:04 +01:00
2031fb16f5
Get rid of panic in stats for lxc
...
Fix containers dir
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7dce9024947e6d573fc5ad0e2151e07c204c474c
Component: engine
2015-03-24 21:12:06 -07:00
b369dc093b
Code simplification that @tiborvass requested
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
Upstream-commit: e8e60befd6c3b4feac975a84cd907659788fabc1
Component: engine
2015-03-24 21:10:07 -04:00
4ab99c503e
Changing bitflag checking style to preferred style. Fixes #11668
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
Upstream-commit: ec5e22efe3fb88f2fa2eb5e9a37161940f86bcfa
Component: engine
2015-03-24 21:09:25 -04:00
9709821e24
Merge pull request #10527 from mfojtik/lxc_11
...
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
Upstream-commit: 22dba32b4dab6cec7b7a2d6dffa94a5fe713c2d3
Component: engine
2015-03-24 17:37:27 -07:00
1da629c7e0
Merge pull request #11018 from delftswa2014/10958-pidfile
...
Moves pid file operations to /pkg/
Upstream-commit: d214e640321ffe318fb3b89bdc55320549a7e4ae
Component: engine
2015-03-24 17:20:52 -07:00
e0fdaa87e8
Moved pidfile from utils to pkg
...
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.
Signed-off-by: Rick Wieman <git@rickw.nl >
Upstream-commit: 772833274fd84b3c960ccab14258b7e5a00b18cd
Component: engine
2015-03-24 23:59:32 +01:00
08138d304c
Mkdir for lxc root dir before setup of symlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 246cab90f216e68c25178ffd19756ab864b809d0
Component: engine
2015-03-24 15:53:23 -07:00
d5ac91b394
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
Upstream-commit: f3fc857e018dc919fddfea645b8308379343cb4e
Component: engine
2015-03-24 14:58:30 -07:00
0ed97cdda4
Squashed commit of the following:
...
commit d379f7645026001ce57fd6421c819f6c7df77964
Author: Matthew Mayer <matthewkmayer@gmail.com >
Date: Mon Mar 23 22:13:06 2015 -0700
Removes unused imports.
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
commit 6e1f77c7f1566c8719087d88fbe06bade122691c
Author: Matthew Mayer <matthewkmayer@gmail.com >
Date: Mon Mar 23 20:41:16 2015 -0700
Removes bind dir creation in daemon start.
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
Upstream-commit: 08d75bc450b0927966ef9c4bebe42256cf4a64ac
Component: engine
2015-03-24 14:56:45 -07:00
f0be9c4403
History.Swap Use parallel assignment to swap elements, as it's
...
a more idiomatic way for golang than using a temp variable.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: fc325274e84a0c16b758e3d6b121c9af1150cce2
Component: engine
2015-03-25 00:13:13 +03:00
02a1b68a98
Merge pull request #11417 from rhatdan/btrfs
...
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
Upstream-commit: 8fc9e400866456d72727afb9f8ea3a23abc4282e
Component: engine
2015-03-24 16:00:15 -04:00
6c54305281
Merge pull request #10283 from rhatdan/dev
...
We want to allow the sharing of /dev from the host into the container.
Upstream-commit: 131b29f7bc003ab6e6fc1d4e06fcf6764f4f7e6d
Component: engine
2015-03-24 12:57:44 -07:00
558349d8ce
Merge pull request #11689 from calavera/ipallocator_refactor
...
Use a structure to keep the allocated ips pool.
Upstream-commit: f7900cdd67e71a418d3cbfeb1b23315c5be78bdf
Component: engine
2015-03-24 12:42:30 -07:00
85625e1ab5
Merge pull request #11709 from paulbellamy/11626-portallocator
...
Refactor global portallocator and portmapper state
Upstream-commit: ce372cd6642ff0dd2de9eece489a847f088eb3bd
Component: engine
2015-03-24 13:51:00 -05:00
0185f15317
Use a structure to keep the allocated ips pool.
...
Fixes #11624 .
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7e95b13460a58db75630d2d795482f39c68762c2
Component: engine
2015-03-24 11:41:44 -07:00
8d8bb83013
Merge branch 'master' of github.com:docker/docker into btrfs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 25c4a923424bdc659cdb18239290196272d17423
Component: engine
2015-03-24 14:14:54 -04:00
a6001c7df9
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1e788ec9855058913de6ac8a2be7acee0f001954
Component: engine
2015-03-24 10:47:30 -07:00
1e47557825
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
8938696741
Refactor global portallocator and portmapper state
...
Continuation of: #11660 , working on issue #11626 .
Wrapped portmapper global state into a struct. Now portallocator and
portmapper have no global state (except configuration, and a default
instance).
Unfortunately, removing the global default instances will break
```api/server/server.go:1539```, and ```daemon/daemon.go:832```, which
both call the global portallocator directly. Fixing that would be a much
bigger change, so for now, have postponed that.
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com >
Upstream-commit: 87df5ab41b3f9b2bdd8682f4afd41dac78f7e96d
Component: engine
2015-03-24 11:15:30 +00:00
68100310d8
Removed unused "mutex" field
...
fixes #11659
Signed-off-by: Alena Prokharchyk <alena@rancher.com >
Upstream-commit: dabd8a02aeff8b2122efa0b55de4ba52c429f936
Component: engine
2015-03-23 19:05:21 -07:00
7074731d32
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
59aa846db8
Syslog.Log - Remove redundant cast of msg.Line []byte to string as
...
it's a fmt.Sprintf responsibility.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: f2c7b4d7437443d469b2247362835af02ccef385
Component: engine
2015-03-24 01:35:54 +03:00
6be1b45eff
Merge pull request #11545 from cpuguy83/remove_allocator_warning
...
Don't warn when ip_local_port_range not found
Upstream-commit: ccd4181d10752c41603fcc03bb6b576603b24271
Component: engine
2015-03-23 14:19:57 -07:00
b2d8692608
Merge pull request #11660 from paulbellamy/11626-portallocator
...
Refactoring portallocator away from a global var
Upstream-commit: d852e5fde89ecd5eec53983be3c62e371147ad8c
Component: engine
2015-03-23 14:10:56 -07:00
4df1193b38
Refactor global portallocator state into a global struct
...
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com >
Upstream-commit: 12576798769081823a3f660b46290da808630616
Component: engine
2015-03-23 20:41:41 +00:00
f2b00f6fe1
Improve err message when parsing kernel port range
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8e4d9f3cf9669f45b0591eea27c47b6f64d89c2d
Component: engine
2015-03-23 13:29:25 -07:00
974bfa30e6
Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check
...
syslog Close() - Remove redunant nil check, s.writer cannot be nil
Upstream-commit: 2717302cc69c865cfec02fb48b3cb173d6980364
Component: engine
2015-03-23 12:32:26 -07:00
84d2a9e3ec
Remove redunant nil check, s.writer cannot be nil
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e600df2d9732b8c40d056563e361ded6cd5ce773
Component: engine
2015-03-23 20:03:24 +01:00
1ef60888a8
Refactor syslog Log else clause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8f025aae36fd040d8d2617890b258b5460ae44db
Component: engine
2015-03-23 20:01:01 +01:00
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
2ae5f5eb68
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
Upstream-commit: 1fe55b2f8bc966c0784527b30f507cbc90325df7
Component: engine
2015-03-23 10:43:02 -07:00
