7c799c6dee
Merge pull request #9187 from icecrime/update_authors_file
...
Update AUTHORS file
Upstream-commit: 0722c9b536a6f9617f77090bfc78b9c583a1b8d1
Component: engine
2014-11-18 16:31:07 -08:00
eb0584215a
Merge pull request #9218 from tianon/check-overlayfs
...
Add CONFIG_OVERLAYFS_FS to check-config.sh
Upstream-commit: e393ca672ed71ff778db284517593bab680a79c4
Component: engine
2014-11-18 16:56:56 -07:00
3058d3242d
Merge pull request #9216 from jfrazelle/typo-steam
...
Fix steam where it should be stream.
Upstream-commit: ca4be114e9f8b38805f7f16f58fe2d8468c95bfe
Component: engine
2014-11-18 15:29:33 -08:00
c334a2067e
Merge pull request #8150 from dqminh/pull-output-non-terminal
...
Pull: print some data instead of newlines when output is not a terminal
Upstream-commit: 9854b0aa40eb3261d599604915c909cebcc60179
Component: engine
2014-11-18 16:20:42 -07:00
87e8b60fe9
Add CONFIG_OVERLAYFS_FS to check-config.sh
...
Also, added some slight adjustment to the AUFS_FS output/note to make it more clear what it applies to.
Example output:
```console
$ ./contrib/check-config.sh
info: reading kernel config from /proc/config.gz ...
Generally Necessary:
- cgroup hierarchy: properly mounted [/sys/fs/cgroup]
- CONFIG_NAMESPACES: enabled
- CONFIG_NET_NS: enabled
- CONFIG_PID_NS: enabled
- CONFIG_IPC_NS: enabled
- CONFIG_UTS_NS: enabled
- CONFIG_DEVPTS_MULTIPLE_INSTANCES: enabled
- CONFIG_CGROUPS: enabled
- CONFIG_CGROUP_CPUACCT: enabled
- CONFIG_CGROUP_DEVICE: enabled
- CONFIG_CGROUP_FREEZER: enabled
- CONFIG_CGROUP_SCHED: enabled
- CONFIG_MACVLAN: enabled
- CONFIG_VETH: enabled
- CONFIG_BRIDGE: enabled
- CONFIG_NF_NAT_IPV4: enabled
- CONFIG_IP_NF_FILTER: enabled
- CONFIG_IP_NF_TARGET_MASQUERADE: enabled
- CONFIG_NETFILTER_XT_MATCH_ADDRTYPE: enabled
- CONFIG_NETFILTER_XT_MATCH_CONNTRACK: enabled
- CONFIG_NF_NAT: enabled
- CONFIG_NF_NAT_NEEDED: enabled
Optional Features:
- CONFIG_MEMCG_SWAP: enabled
- CONFIG_RESOURCE_COUNTERS: enabled
- CONFIG_CGROUP_PERF: missing
- Storage Drivers:
- "aufs":
- CONFIG_AUFS_FS: missing
(note that some kernels include AUFS patches but not the AUFS_FS flag)
- CONFIG_EXT4_FS_POSIX_ACL: enabled
- CONFIG_EXT4_FS_SECURITY: enabled
- "btrfs":
- CONFIG_BTRFS_FS: enabled
- "devicemapper":
- CONFIG_BLK_DEV_DM: enabled
- CONFIG_DM_THIN_PROVISIONING: enabled
- CONFIG_EXT4_FS: enabled
- CONFIG_EXT4_FS_POSIX_ACL: enabled
- CONFIG_EXT4_FS_SECURITY: enabled
- "overlayfs":
- CONFIG_OVERLAYFS_FS: missing
```
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 54a6e6d1229adb1169809493af89600c5ccc70ae
Component: engine
2014-11-18 12:20:49 -07:00
1b2e957b5a
Fix steam where it should be stream.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7fe8d0aeeb373a0fef92758819d8054fbd744ea5
Component: engine
2014-11-18 10:49:01 -08:00
616801a125
Merge pull request #9189 from satnam6502/docfix
...
Consistently use sudo docker
Upstream-commit: 660eadae3d56195e05da170593af50f0d7752706
Component: engine
2014-11-18 01:17:48 -05:00
2e6d4cf87e
Merge pull request #9193 from somaopensource/docs_misspelling
...
Fix misspelling
Upstream-commit: 4fff1505eb00cf679792b2e064dc1fa08a9c6587
Component: engine
2014-11-18 01:16:27 -05:00
00bf60f5c4
Merge pull request #8937 from vbatts/vbatts-mount_optional_fields
...
pkg/mount: include optional field
Upstream-commit: 379c0da4648f7a8d62740b5c217cfac58f45ca10
Component: engine
2014-11-17 18:25:00 -08:00
569d615f97
Merge pull request #9204 from jfrazelle/9056-rmi
...
Fix for rmi throws error "no such id".
Upstream-commit: 17dfa126baabb7300e4a5193689cde01ece24747
Component: engine
2014-11-17 18:08:52 -08:00
801f67cf03
Merge pull request #8749 from brahmaroutu/resize_uponstart_8728_2
...
Fix the documentation and integration test for container resize
Upstream-commit: e2d08bd5ead101bdb58868492179f0bbe72547f3
Component: engine
2014-11-17 17:24:58 -08:00
5f5c30608e
Consistently use sudo docker
...
Signed-off-by: Satnam Singh <satnam@raintown.org >
Upstream-commit: b273c447e0f0b124d5f81ff60033a4894e2acec8
Component: engine
2014-11-17 17:14:39 -08:00
12f949a058
Fix for rmi -f when error "no such id". (9056)
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ac40e7cbb3cf01568b3763abe04af814d89a6f36
Component: engine
2014-11-17 17:04:10 -08:00
5d1b12a860
Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer
...
makes the -s --size option documentation clearer #8950
Upstream-commit: 882db5f8858f36e213feabda459e6b5e639c5c85
Component: engine
2014-11-17 17:42:27 -07:00
b3efa18c2e
Add test for bug (9056) where rmi -f fails with "no such id".
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: a0605107d713f7f8a25277b06369134d17781077
Component: engine
2014-11-17 15:12:55 -08:00
71912fc9e2
pkg/mount: testing mountinfo fields
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 83d7db3e505f2d080ac78ca7777937c812588003
Component: engine
2014-11-17 16:17:06 -05:00
a531c55832
Update libcontainer to 28cb5f9dfd6f3352c610a4f1502
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 975fa5487ca531374fed421b52de1adf133c9810
Component: engine
2014-11-17 12:16:37 -08:00
884eb7da74
Fix the documentation and integration test for container resize
...
Closes #8728
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 91fb9b2f5a07232cecfcde38a98c3ec6410239b7
Component: engine
2014-11-17 18:38:08 +00:00
e7d027944d
Remove obsolete comments
...
In the below comment line, already codes for log exists so
following comment is obsolete.
// TODO log
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: d5098fde9a64fdec2098c7a0c6bd777f88f7d4c9
Component: engine
2014-11-17 23:27:03 +09:00
8ac9679df7
Update AUTHORS file
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: ab7a6544b09c0b061e35aa7df766ef7adc1fd2fe
Component: engine
2014-11-16 23:41:25 -08:00
89f15328f3
Merge pull request #8699 from shuai-z/fix-portalloc
...
Fix corner cases in ipallocator and portallocator
Upstream-commit: 34cb92e2d49e2c141a67cd5df73a54c1655b2842
Component: engine
2014-11-16 22:10:40 -08:00
d9d0e279e9
Fix misspelling
...
Fix misspelling from independant to independent
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: bdaa76e8cf3baeeaa645d91aed168028301f537f
Component: engine
2014-11-17 04:23:22 +09:00
18dd4cded4
Merge pull request #8335 from duglin/Issue5198
...
Add --log-level support - Issue #5198
Upstream-commit: 61e4b4e1d015032e6e7ee17658023c4101be3e36
Component: engine
2014-11-15 10:53:31 -08:00
40988ed79f
Add --log-level support
...
Next steps, in another PR, would be:
- make all logging go through the logrus stuff
- I'd like to see if we can remove the env var stuff (like DEBUG) but we'll see
Closes #5198
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 2facc0467336a80f48c765dbdbd803055a431aa9
Component: engine
2014-11-15 09:00:48 -08:00
35f4af009d
Add windows/(386,amd64) to cross platforms list
...
Edited make scripts to append .exe to windows binary
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: b7703a992e14255a5972bf157d0c2cfc0da3d53f
Component: engine
2014-11-14 18:20:54 -08:00
cd6fd83f37
Fix input volume path check on Windows
...
used path package instead of path/filepath so that --volumes and
--device parameters to always validate paths as unix paths instead of
OS-dependent path convention
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: 5a38680bd2283c87848d2e7f62a14f0261291c7c
Component: engine
2014-11-14 18:20:54 -08:00
a64d9e402a
Use USERPROFILE path on Windows as home directory
...
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: d4dbb708320e59efa91b077303c87f9e9513cd91
Component: engine
2014-11-14 18:20:54 -08:00
deefafa9d6
Remove unused sysinfo parameter to runconfig.Parse
...
Removing dead code.
Signed-off-by: John Gossman <johngos@microsoft.com >
Upstream-commit: e45b0f92711ff190cff4b61b2ea80cdd53203a16
Component: engine
2014-11-14 18:20:54 -08:00
46e167f95c
Refactor pkg/archive with a platform-independent stat struct
...
pkg/archive contains code both invoked from cli (cross platform) and
daemon (linux only) and Unix-specific dependencies break compilation on
Windows. We extracted those stat-related funcs into platform specific
implementations at pkg/system and added unit tests.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: 2180aa4f6f2ad4d8f284d63ee29e93547263976e
Component: engine
2014-11-14 18:20:54 -08:00
39256638f6
Extract mknod, umask, lstat to pkg/system
...
Some parts of pkg/archive is called on both client/daemon code. To get
it compiling on Windows, these funcs are extracted into files with
build tags.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: 3d2fae353f6ddc819d3a3c4db80887a40ac6f5f0
Component: engine
2014-11-14 18:20:54 -08:00
179af9eeb6
Extract TreeSize to daemon build
...
TreeSize uses syscall.Stat_t which is not available on Windows.
It's called only on daemon path, therefore extracting it to daemon
with build tag 'daemon'
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: b64c9b521ab4e4082ed874a23a493f4a266304d5
Component: engine
2014-11-14 18:20:53 -08:00
c976d3fdc2
Consolidate tmpdir implementations, include Windows
...
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: 376ae7780bf04d89ad1532f1c2a752535fa7ac7d
Component: engine
2014-11-14 18:20:53 -08:00
2e7196248a
Extract client signals to pkg/signal
...
SIGCHLD and SIGWINCH used in api/client (cli code) are not
available on Windows. Extracting into separate files with build
tags.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: 91a86670aac52d916c81a818aff3dfcf445da83e
Component: engine
2014-11-14 18:20:53 -08:00
4c601bc6dd
Refactor pkg/term package for Windows tty support
...
Signed-off-by: John Gossman <johngos@microsoft.com >
Upstream-commit: 975b6e598d44408c865993bbb650cc7117133ffc
Component: engine
2014-11-14 18:20:53 -08:00
aa1451c42e
Merge pull request #9151 from tonistiigi/aufs-clipping-fix
...
Fix AUFS silent mount errors on many layers
Upstream-commit: 8682bac309cc46ca31fa35d93a8045061aba5b0f
Component: engine
2014-11-14 17:35:07 -08:00
4faf5170e1
Merge pull request #9164 from vbatts/vbatts-dm_removedevice
...
pkg/devicemapper: cleanup removeDevice differences
Upstream-commit: c89062bafc2262c5efeee905bafb72be57873478
Component: engine
2014-11-14 16:56:02 -08:00
b34358b506
pkg/devicemapper: defer udev wait during removal
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: cef27e1d6c0bd302e1c58e9478a0fba99fd3a2d0
Component: engine
2014-11-14 15:17:33 -05:00
4798207faf
pkg/devicemapper: cleanup removeDevice differences
...
Fixes failure on RemoveDevice when host is AUFS, and running
devicemapper test docker-in-docker
https://gist.github.com/tonistiigi/59559cbfb3f2df26b29c
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: c9a76622086cf6019b3ec71ae53fc71c0396a1ef
Component: engine
2014-11-13 22:43:03 -05:00
e61d8cd073
Fix AUFS silent mount errors on many layers
...
Fixes #1171
Fixes #6465
Data passed to mount(2) is clipped to PAGE_SIZE if its bigger. Previous
implementation checked if error was returned and then started to append layers
one by one. But if the PAGE_SIZE clipping appeared in between the paths, in the
permission sections or in xino definition the call would not error and
remaining layers would just be skipped(or some other unknown situation).
This also optimizes system calls as it tries to mount as much as possible with
the first mount.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: 6d97339ca23ada27812572016ad4ff9ccffa8b09
Component: engine
2014-11-13 20:13:13 +02:00
90c31c6725
Merge pull request #8986 from vbatts/vbatts-pkg_devicemapper_bindings
...
devicemapper: split out devicemapper bindings
Upstream-commit: 42861f3b45733268da674b82bceb6deef67b5513
Component: engine
2014-11-12 19:59:36 -05:00
d82839394f
Merge pull request #8982 from rhvgoyal/save-restore-device-id
...
Save restore device Id: issue #8978
Upstream-commit: 9670871e0166658c5b6982d3ccf79a82afb9442c
Component: engine
2014-11-12 15:41:27 -08:00
4981609d4e
Merge pull request #9031 from cpuguy83/cleanup_api_server_creation
...
Cleanup api server creation
Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e
Component: engine
2014-11-12 15:37:34 -08:00
94f9b5175d
Merge pull request #9124 from erikh/secure-localhost
...
Secure localhost registry (carry of #8898 )
Upstream-commit: 33382385c3f58da82099f5c7fa39dd65cb8c8170
Component: engine
2014-11-12 15:25:15 -08:00
e5982e367c
Adding Vish as a maintainer for daemon code.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 06bf79552d222ef6c4547ae8b0f3cb474a031c76
Component: engine
2014-11-12 22:55:32 +00:00
db22845d50
Merge pull request #9105 from stevenburgess/archiveCommentFix
...
Fix comment to match the arg name
Upstream-commit: 3ef2fc7f0f025d3e4fc97ccbcc75cbfa667ccb2d
Component: engine
2014-11-12 14:52:27 -08:00
a083823cc6
Merge pull request #8479 from vishh/OOM
...
Provide Out Of Memory information in container status
Upstream-commit: 08f5edce3092e55f90116fac1b6f634965008f2b
Component: engine
2014-11-12 14:15:29 -08:00
f8e94225af
registry: always treat 127.0.0.1 as insecure for all cases anytime anywhere
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 11380a109e53bc5f388b6212c12794609c0241eb
Component: engine
2014-11-12 12:14:43 -08:00
dc8c6e365a
registry: default --insecure-registry to localhost and 127.0.0.1
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
Upstream-commit: 28ee373e19bbfdf47c747f6fd9385a8a75f0a483
Component: engine
2014-11-12 09:12:42 -08:00
957b4d5684
devmapper: Take care of some review comments
...
Took care of some review comments from crosbymichael.
v2:
- Return "err = nil" if file deviceset-metadata file does not exist.
- Use json.Decoder() interface for loading deviceset metadata.
v3:
- Reverted back to json marshal interface in loadDeviceSetMetaData().
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 15c74bebc1ea2d51612b5809b4477551547a8b3d
Component: engine
2014-11-12 09:36:32 -05:00
e0e5e418c1
Merge pull request #9102 from brahmaroutu/add_tag_9001
...
improve error message to print the tag
Upstream-commit: 6ad1cd5d0f3a27abb3fdb89cc4104328f1b04b49
Component: engine
2014-11-12 02:37:40 -07:00
