645c020f5a
fix up Image-name related issues in docker ps and CI
...
This patch include the following fixs:
- fix image name error when docker ps
- fix docker events test failure: use the exact image name for filter
- fix docker build CI test failure due to "docker events" change
Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
2015-04-09 23:03:23 +08:00
7e70998bb8
Cleanup events filter by container test
...
This also seemed to be checking the ordering of the events, which
doesn't seem like something we sould be interested in this particular
test.
Added check to make sure the filtered events have the expected ID's.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-09 09:47:58 -04:00
197ec4a637
namesgenerator: Proposing Kilby/Noyce
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-09 04:11:06 -07:00
4c69d0dd8a
cli_info_test: Check all required fields
...
`TestInfoEnsureSucceeds` is supposed to check existence of all
expected fields that are going to be shown in `docker info` command.
If this list was complete, it could have helped catching the missing
`"Logging Driver:"` regression.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-09 04:01:39 -07:00
a4b7a9e1e5
cli: Better wording for daemon --log-driver
...
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.
Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-09 02:12:44 -07:00
809d99ad91
docs: add missing accent mark around docker command
...
As we did everywhere.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-04-09 04:37:23 -04:00
0fc75a3136
Removing unused getBoolParam func from api/server/server.go
...
Fix #12199
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
2015-04-09 09:13:16 +03:00
d045b9776b
Remove Job from `docker images`
...
Also removes engine.Table
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 19:33:01 -07:00
663d913011
Show the right image name/ID in job log
...
When we tag an Image with several names and we run one of them,
The "create" job will log this event with
+job log(create, containerID, Imagename).
And the "Imagename" is always the first one (sorted). It is the
same to "start/stop/rm" jobs. So use the correct name instand.
This PR refer to #10479
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
2015-04-09 09:41:23 +08:00
c2c45d7769
execdriver/lxc: use local rand.Random in test
...
Preventing the test execution to pollute the deterministic runtime environment
by seeding the global rand.Random.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-08 18:13:07 -07:00
91abff41dd
Merge pull request #12206 from jfrazelle/11966-fix-racy-tests-on-overlay
...
cleanup/fix integration-cli for overlay in overlay
2015-04-08 20:52:58 -04:00
255b84444a
cleanup/fix integration-cli for overlay in overlay
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-04-08 16:59:36 -07:00
b66597eef1
docs: Markdown format fix around LogConfig param
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-08 16:16:37 -07:00
53582321ee
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-08 18:50:29 -04:00
7bb4b055ab
Improve test accuracy for pkg/chrootarchive (part 1)
...
Check test correctness of untar by comparing destination with
source. For part one, it only compares the directories.
This is a supplement to the #11601 fix.
Signed-off-by: Yestin Sun <yestin.sun@polyera.com>
2015-04-08 14:07:31 -07:00
7233bd223d
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
2015-04-08 13:43:47 -07:00
56a2c58760
Merge pull request #12194 from icecrime/update_maintainers
...
Drop shin from MAINTAINERS
2015-04-08 13:43:01 -07:00
66a68e378c
Merge pull request #12171 from cstivers78/patch-1
...
Proposing Seymour Cray
2015-04-08 13:42:13 -07:00
d0c1fba73e
Drop shin from MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-08 13:31:42 -07:00
5206f76f44
Proposing Seymour Cray
...
Signed-off-by: Chris Stivers <chris@stivers.us>
2015-04-08 13:17:22 -07:00
776b7e8559
Merge pull request #12191 from kostickm/12189-fix-json-tags
...
Fixing JSON Tags
2015-04-08 13:11:54 -07:00
57536d82e7
Merge pull request #12187 from moxiegirl/docs-makefile-update
...
Adding environment variables for sub projects
2015-04-08 12:48:09 -07:00
ef8b917fac
Adding environment variables for sub projects
...
Fixes issue #12186
Fixing variables per Jess
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:23:50 -07:00
88119bb276
Fixing JSON Tags
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-08 12:05:12 -07:00
26e83832c7
Merge pull request #11855 from nfirvine/master
...
Add some new graphics for mac installation with boot2docker
2015-04-08 10:41:50 -07:00
1bfa80bdd9
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 10:30:17 -07:00
ebc1e5ec9f
Merge pull request #12176 from YanFeng-Adam/typo
...
Fix a typo in /doc/sources/reference/run.md
2015-04-08 10:08:05 -07:00
f9d323d712
Fixing up the README
...
Fixing some small issues I found in the README like missing punctuation,
trailing whitespace, etc.
Signed-off-by: David Davis <daviddavis@redhat.com>
2015-04-08 12:57:19 -04:00
b8a7fdade6
Merge pull request #12178 from fschindler/fix-typo
...
Fixing typo.
2015-04-08 09:10:53 -07:00
254d6f7752
Merge pull request #12133 from xiaods/fixed-issue-11500
...
fixed #11500 Add tip about filter proxy
2015-04-08 09:09:54 -07:00
a6d39e2a2d
Merge pull request #12168 from cpuguy83/remove_dup_file_creation
...
Remove duplicate config file creation.
2015-04-08 09:03:43 -07:00
3ebfc99d10
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
2015-04-08 08:29:24 -07:00
64fd944e30
Fix a typo in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
2015-04-08 11:23:47 -04:00
94ade35e46
Merge pull request #12183 from runcom/remove-job-diff
...
Remove engine.Job from diff
2015-04-08 08:21:43 -07:00
e379e2668c
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-08 15:52:10 +02:00
7cfe438151
Merge pull request #12132 from sunyuan3/d
...
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
2015-04-08 08:09:22 -04:00
8afd5cad31
Fixing typo.
...
Added missing white space.
Signed-off-by: Felix Schindler <fschindler@weluse.de>
2015-04-08 11:03:11 +02:00
a40f379878
fixed #11500 Add tip about filter proxy
...
fixed #11500
Add tip about filter proxy to Docker installation Guides
Signed-off-by: Deshi Xiao <xiaods@gmail.com>
2015-04-08 14:13:01 +08:00
cc30282e94
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-08 13:33:05 +08:00
24057777af
Remove duplicate config file creation.
...
When `toDisk` is called, it is creating a file already, no need to
create it here.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-07 21:36:30 -04:00
06433cf812
Merge pull request #12161 from LK4D4/update_libcontainer
...
Update libcontainer
2015-04-07 16:18:33 -07:00
d08db9a059
Merge pull request #12160 from mrunalp/remove_unused
...
Removes unused function.
2015-04-07 16:05:49 -07:00
ce69dafe4d
Test case for network mode chain container -> container -> host
...
Issue #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 15:20:42 -07:00
195bebd3a7
Removes unused function.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-04-07 18:15:28 -04:00
dccda72a41
Merge pull request #12120 from LK4D4/split_attach
...
Remove engine usage from attach
2015-04-07 18:13:35 -04:00
2f853b9493
Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44
...
Fix #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 15:10:44 -07:00
8b71930570
Merge pull request #12154 from moxiegirl/carry-pr-11409
...
Carrying 11409 for a contributor
2015-04-07 15:00:26 -07:00
d1423d28b5
Merge pull request #12155 from kostickm/12146-fix-fail-msg-TestRunDeviceDirectory
...
Fixing fail message in TestRunDeviceDirectory
2015-04-07 14:55:30 -07:00
65ca20e6f1
Merge pull request #12156 from moxiegirl/pr-12008-carry
...
Carry PR 12008 for contributor
2015-04-07 14:54:02 -07:00
c44f513248
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 14:23:09 -07:00
Liu Hua
Brian Goff
Ahmet Alp Balkan
Chen Hanxiao
WiseTrem
Doug Davis
Jessica Frazelle
Tibor Vass
Yestin Sun
Arnaud Porterie
Michael Crosby
Chris Stivers
Alexander Morozov
moxiegirl
Megan Kostick
David Davis
Yan Feng
Antonio Murdaca
Doug Davis
Felix Schindler
Deshi Xiao
Yuan Sun
Jessie Frazelle
Alexander Morozov
Mrunal Patel
Tibor Vass