Commit graph

20072 commits

Author SHA1 Message Date
David Calavera
8fa09749fb Merge pull request #17718 from wenchma/17716_before_filter_doc
Re-implement --before and --since as options for --filter
2015-11-20 11:24:19 -08:00
Michael Crosby
6e49343202 Merge pull request #18067 from cpuguy83/fix_pull_space_test
Make TestDaemonNoSpaceleftOnDeviceError linux only
2015-11-20 10:51:21 -08:00
Alexander Morozov
6980113d10 Merge pull request #18126 from tiborvass/merge_release_v1.9.1
Merge release v1.9.1
2015-11-20 10:45:59 -08:00
Tibor Vass
75cb2dfe91 Bump version back to 1.10.0-dev
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-11-20 13:40:25 -05:00
Tibor Vass
fefbb507a9 Bump version to v1.9.1
Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	VERSION
2015-11-20 13:38:15 -05:00
Jess Frazelle
c1f11f8144 Merge pull request #18109 from phemmer/yum-docs-fix
remove unnecessary echo from yum docs
2015-11-20 13:10:55 -05:00
Alexander Morozov
a76bdea21b Merge pull request #16168 from NIWAHideyuki/16164-shm-size
Addition of "--shm-size" to which size of /dev/shm is changed
2015-11-20 10:01:48 -08:00
Brian Goff
44d3f2f71a Make TestDaemonNoSpaceleftOnDeviceError linux only
Adds SameHostDaemon and DaemonIsLinux req's to
TestDaemonNoSpaceleftOnDeviceError

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-20 12:44:49 -05:00
Vincent Demeester
f9a4751eeb Merge pull request #18115 from wenchma/16756-docker_api_exec_test
Use checker Assert for integration-cli/docker_api_exec_test.go
2015-11-20 18:14:21 +01:00
Tibor Vass
6e727a4c80 Merge pull request #17456 from Microsoft/TestChtimesFix
Fix ChTimes to prevent setting times past the Unix Max Time
2015-11-20 18:07:09 +01:00
Wen Cheng Ma
1814a1dac5 Use checker Assert for integration-cli/docker_api_exec_test.go
Partially fix issue #16756

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-20 23:34:52 +08:00
Sebastiaan van Stijn
7a1b05ccce Merge pull request #18101 from IanLee1521/patch-1
Fix minor grammar mistake.
2015-11-20 11:43:42 +01:00
Sebastiaan van Stijn
d8ea32caa8 Merge pull request #18026 from woodvi/doc-network-tutorial
change "Web" to "web" to match case-sensitive name used for creation;…
2015-11-20 10:46:00 +01:00
Sebastiaan van Stijn
20905ec452 Merge pull request #17861 from gissehel/apt-source-doc
explicit way to express that docker.list are different choices and not just one big file
2015-11-20 10:06:13 +01:00
Sebastiaan van Stijn
3dac1fb189 Merge pull request #18079 from moxiegirl/fix-bad-markdown
Small Markdown Fixes to storage driver/commands ref
2015-11-20 09:22:04 +01:00
Wen Cheng Ma
1921c62938 Re-implement --before and --since as options for --filter
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-20 13:10:13 +08:00
Patrick Hemmer
3cbccccb37 remove unnecessary echo from yum docs
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
2015-11-19 20:51:43 -05:00
Mary Anthony
9941d5bc33 Small changes to storage driver/commands ref
Entering V's comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-19 17:13:23 -08:00
Michael Crosby
ee03a05595 Merge pull request #17005 from mavenugo/restart
Adding a restart test to make sure #16887 doesnt happens again
2015-11-19 17:01:34 -08:00
NIWA Hideyuki
5aeaf2a0c4 Addition of "--shm-size" to which size of /dev/shm is changed.
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
2015-11-20 09:24:18 +09:00
Michael Crosby
249b3a9479 Merge pull request #17459 from brahmaroutu/Power_Z_CI
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
2015-11-19 15:50:07 -08:00
Alexander Morozov
9c21e852b2 Merge pull request #18082 from MHBauer/gh9406
Remove defaults for flags/options that expect no value
2015-11-19 15:06:21 -08:00
Alexander Morozov
0d98e2470f Merge pull request #18103 from crosbymichael/image-link
Remove alt from markdown image
2015-11-19 14:09:43 -08:00
Michael Crosby
38a58a4a1c Remove alt from markdown image
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-11-19 14:06:16 -08:00
Michael Crosby
da969aac5a Merge pull request #18102 from mavenugo/sb_ep_race
Fixed an endpoint delete issue with a possible stale sbox
2015-11-19 13:55:28 -08:00
Alexander Morozov
8e6e38990c Merge pull request #18084 from wenchma/18054_exec_start_fix
Update docs and test of exec create api return codes
2015-11-19 13:51:46 -08:00
Alexander Morozov
24fb3659df Merge pull request #18076 from rhvgoyal/unmount-recursive
Unmount recursively to unmount volumes
2015-11-19 13:46:48 -08:00
Alexander Morozov
37f64ded44 Merge pull request #17908 from calavera/carry_17059
[Carry 17059] allow filtering containers by any status
2015-11-19 13:24:43 -08:00
Vincent Demeester
b205b06d3e Merge pull request #18096 from Microsoft/jjh/dockerinfoav
Windows: [TP4] docker info crashes
2015-11-19 21:48:02 +01:00
Madhu Venugopal
423b55c4b4 Fixed an endpoint delete issue with a possible stale sbox
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-19 12:46:37 -08:00
Vivek Goyal
b9e701b203 Use lazy unmount to unmount volumes
Volumes can have more mount points beneath them and unmount will fail. This
is the case when a bind mounted directory on host already had a mount point
underneath it. So use lazy unmount instead.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-11-19 20:46:07 +00:00
Ian Lee
ad7696a787 Fix minor grammar mistake.
Signed-off-by: Ian Lee <IanLee1521@gmail.com>
2015-11-19 12:24:25 -08:00
David Calavera
2a07b19fd8 Test that paused containers show up filtering by status.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-19 14:32:25 -05:00
Kamil Domański
f30364c583 allow filtering containers by any status
Signed-off-by: Kamil Domański <kamil@domanski.co>
(cherry picked from commit 9ada6a06c5)
2015-11-19 14:11:41 -05:00
Darren Stahl
318ad1cb43 This fixes Chtimes on systems with 32 bit Timespec
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-19 11:08:29 -08:00
John Howard
37d2a70038 Windows: [TP4] docker info crashes
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-19 11:02:25 -08:00
David Calavera
aade9536b6 Merge pull request #18090 from vdemeester/17478-follow-up-cleanup-pkg-platform
Follow-up of 17478, unexport runtimeArchitecture method
2015-11-19 14:00:23 -05:00
Antonio Murdaca
758fae5f6b Merge pull request #18083 from Mashimiao/opt-weightdevice-fix-typo
opts/weightdevice: fix typo
2015-11-19 19:44:18 +01:00
Antonio Murdaca
43cf875633 Merge pull request #18064 from hypriot/17478-fix-for-arm
Change casting of utsname.Machine to fix make binary for ARM
2015-11-19 19:42:20 +01:00
Stefan Scherer
7c1d49d90c Move charsToString to architecture dependent source to fix casting problem
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-11-19 18:09:08 +01:00
Morgan Bauer
48718a3c77
Remove defaults for flags/options that expect no value
- isZeroValue function from upstream go
 - covers booleans, strings and numbers
 - change integration to reflect new behavior
 - resolves #9406

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-11-19 08:37:51 -08:00
Wen Cheng Ma
01b86d612c Update docs and test of exec create api return codes
Fixes issue #18054

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-19 22:22:27 +08:00
Vincent Demeester
0ff3c10aa8 Follow-up of 17478, unexport private method
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-19 14:55:57 +01:00
Vincent Demeester
c32f8bb36a Merge pull request #17704 from LK4D4/default_cgroupfs
Use fs cgroups by default
2015-11-19 14:01:13 +01:00
Ma Shimiao
8d4c0ba274 opts/weightdevice: fix typo
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-11-19 17:03:46 +08:00
Madhu Venugopal
be9b7a2459 Adding a restart test to make sure #16887 doesnt happens again
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-18 23:29:25 -08:00
Alexander Morozov
419fd7449f Use fs cgroups by default
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-18 16:16:13 -08:00
Michael Crosby
877fe61f75 Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all
Remove the container initializers per platform.
2015-11-18 14:06:47 -08:00
Michael Crosby
0d2ea52f03 Merge pull request #18030 from Microsoft/sjw/pull_id_hack
[TP4] Windows: hacking around content addressable IDs for temporary fix.
2015-11-18 11:08:13 -08:00
moxiegirl
ec72163949 Merge pull request #18069 from vdemeester/fix-volume-doc-typo
Fix a small typo in volume_inspect.md
2015-11-18 10:14:15 -08:00