Commit Graph
14872 Commits
Author SHA1 Message Date
Brian Goff 66b2b6199d Merge pull request #12215 from ahmetalpbalkan/execdriver/localrand
execdriver/lxc: use local rand.Random in test
Upstream-commit: 6b7e520aa3effadc7a08cd82bcff29a4a53f580c
Component: engine
2015-04-09 12:22:25 -04:00
Alexander Morozov c900c31960 Merge pull request #12184 from duglin/RemoveJobImages
Remove Job from `docker images`
Upstream-commit: 6ba7bf440ee1604486015f421456668d00e795a2
Component: engine
2015-04-09 09:19:09 -07:00
Arnaud Porterie d345a7781a Merge pull request #12205 from ahmetalpbalkan/docs/remote-api-LogConfig-format
docs: Markdown format fix around LogConfig param
Upstream-commit: f16d8db78929e1dc479d2f8d6d8df995b91034f4
Component: engine
2015-04-09 09:17:24 -07:00
Arnaud Porterie 898650d746 Merge pull request #12231 from ahmetalpbalkan/integ-cli/TestInfoEnsureSucceeds-all-required
cli_info_test: Check all required fields
Upstream-commit: 74b5c7b284c2794999aef1fae4a63e447d4d28de
Component: engine
2015-04-09 09:07:54 -07:00
Brendan Dixon aff5e53ec8 Corrected int16 overflow and buffer sizes
Signed-off-by: Brendan Dixon <brendand@microsoft.com>
Upstream-commit: a264e1e83debfaefcb99f5554b8eda9c088a09d1
Component: engine
2015-04-09 09:03:04 -07:00
Brian Goff 4bf1025216 Merge pull request #12223 from YanFeng-Adam/typo
Fix a typo in docker/daemon/execdriver/native/exec.go
Upstream-commit: 7dff1c15d2b43fa05e296c7df302b2c11fc014c2
Component: engine
2015-04-09 11:49:02 -04:00
Yan Feng 5ee2e5422a Fix a typo in docker/daemon/execdriver/native/exec.go
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: ab11d605556749e56e9dc5b4b071375765ad60bf
Component: engine
2015-04-09 11:46:09 -04:00
Doug Davis 0eb6cc5ff7 Merge pull request #12207 from WiseTrem/getBoolParam
Removing unused getBoolParam func from api/server/server.go
Upstream-commit: 8295bed3df0e92adfa784ed2564ba094202924d4
Component: engine
2015-04-09 08:28:48 -07:00
Phil Estes 151e2df62b Merge pull request #12227 from HuKeping/rm-rename
Remove Job from rename
Upstream-commit: 00fd22643015c030697b40d23e060bb482cf329b
Component: engine
2015-04-09 11:27:14 -04:00
Hu Keping 16b268e23a Remove Job from rename
A part of ISSUE#12151-Remove engine.Job mechanism

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 49c4de4aebe0ecc3005e56a9ab06b5e43f5b312c
Component: engine
2015-04-10 01:52:55 +08:00
Phil Estes 8529d665c0 Merge pull request #12232 from ahmetalpbalkan/names/kilby-joyce
namesgenerator: Proposing Kilby/Noyce
Upstream-commit: 3ca46f29b86ecec256c857cdfddf39405d5fd67f
Component: engine
2015-04-09 11:25:19 -04:00
Liu Hua adca7cca6d 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>
Upstream-commit: 645c020f5ab7119cd06d7c6a790e9d99fe1cd309
Component: engine
2015-04-09 23:03:23 +08:00
Brian Goff f3865d2e92 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>
Upstream-commit: 7e70998bb80d47e3f3a363fb49feaeaf50d64cbc
Component: engine
2015-04-09 09:47:58 -04:00
Ahmet Alp Balkan 2be71420a6 namesgenerator: Proposing Kilby/Noyce
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 197ec4a6377373b4a0c2eaf90c9fde9cede2074b
Component: engine
2015-04-09 04:11:06 -07:00
Ahmet Alp Balkan 73ef4f0ecf 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>
Upstream-commit: 4c69d0dd8ade90b6602147b8dfb8c1f4c267d3bc
Component: engine
2015-04-09 04:01:39 -07:00
Ahmet Alp Balkan bc679a5419 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>
Upstream-commit: a4b7a9e1e5505983aea3f6d7e246c57a6f4f6170
Component: engine
2015-04-09 02:12:44 -07:00
Chen Hanxiao a3cc1fb41c docs: add missing accent mark around docker command
As we did everywhere.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 809d99ad913fd73ae5da637c26f94879a6eb189c
Component: engine
2015-04-09 04:37:23 -04:00
WiseTrem 85a5c923c7 Removing unused getBoolParam func from api/server/server.go
Fix #12199

Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
Upstream-commit: 0fc75a3136456621c074124819567816420f55bf
Component: engine
2015-04-09 09:13:16 +03:00
Doug Davis 8bd8b0185d Remove Job from docker images
Also removes engine.Table

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d045b9776b5dc16e12b3d7c7558a24cdc5d1aba7
Component: engine
2015-04-08 19:33:01 -07:00
Liu Hua ac0bbebed0 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>
Upstream-commit: 663d9130118548c648c4463bae088fd983099e08
Component: engine
2015-04-09 09:41:23 +08:00
Ahmet Alp Balkan 0e9f46311c 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>
Upstream-commit: c2c45d77691d1ca501a68d20885d040415477c92
Component: engine
2015-04-08 18:13:07 -07:00
Brian Goff f60fa17571 Merge pull request #12206 from jfrazelle/11966-fix-racy-tests-on-overlay
cleanup/fix integration-cli for overlay in overlay
Upstream-commit: 91abff41dda96244ee3e4ae47e7c37c5067657a7
Component: engine
2015-04-08 20:52:58 -04:00
Jessica Frazelle 0d1c1d0efa cleanup/fix integration-cli for overlay in overlay
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 255b84444a86201995d8f688d71b83822f146c3e
Component: engine
2015-04-08 16:59:36 -07:00
Ahmet Alp Balkan a981a686fa docs: Markdown format fix around LogConfig param
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: b66597eef18a02014e0b634dc3dc55dff3de4c20
Component: engine
2015-04-08 16:16:37 -07:00
Tibor Vass 0c091d906f Remove jobs from daemon/networkdriver/bridge
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 53582321ee502335a9c3be4789bef984e09f77c4
Component: engine
2015-04-08 18:50:29 -04:00
Yestin Sun 866fb761f9 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>
Upstream-commit: 7bb4b055abab5f5b561a970f7235c2d113a4d85f
Component: engine
2015-04-08 14:07:31 -07:00
Arnaud Porterie 58278c5226 Merge pull request #12163 from duglin/RemoveJobPS
Remove Job from PS API
Upstream-commit: 7233bd223d4760af604e619a06c2c9ffe3fa1e22
Component: engine
2015-04-08 13:43:47 -07:00
Michael Crosby 113cc5ab8c Merge pull request #12194 from icecrime/update_maintainers
Drop shin from MAINTAINERS
Upstream-commit: 56a2c587605088e31166eb65ad59f5804b52d211
Component: engine
2015-04-08 13:43:01 -07:00
Michael Crosby cddae8691d Merge pull request #12171 from cstivers78/patch-1
Proposing Seymour Cray
Upstream-commit: 66a68e378c4b47bcd698b2053ebf04a27546bd22
Component: engine
2015-04-08 13:42:13 -07:00
Arnaud Porterie c31e88ed52 Drop shin from MAINTAINERS
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: d0c1fba73edfe502d216cb4537036c92137bdb92
Component: engine
2015-04-08 13:31:42 -07:00
Chris Stivers 7eb558ca75 Proposing Seymour Cray
Signed-off-by: Chris Stivers <chris@stivers.us>
Upstream-commit: 5206f76f44f3a55e52d3c0878b0ec780484595c0
Component: engine
2015-04-08 13:17:22 -07:00
Alexander Morozov 1458b613cf Merge pull request #12191 from kostickm/12189-fix-json-tags
Fixing JSON Tags
Upstream-commit: 776b7e855959b82a53c715c9b86dd583939dcba4
Component: engine
2015-04-08 13:11:54 -07:00
moxiegirl 86f7d2f063 Merge pull request #12187 from moxiegirl/docs-makefile-update
Adding environment variables for sub projects
Upstream-commit: 57536d82e797cde90bf49e09771cc6f489cc766e
Component: engine
2015-04-08 12:48:09 -07:00
Mary Anthony c4fa112c81 Adding environment variables for sub projects
Fixes issue #12186
Fixing variables per Jess

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ef8b917fac0b3d98146cadd890234d9179ae2021
Component: engine
2015-04-08 12:23:50 -07:00
Megan Kostick 584caa6937 Fixing JSON Tags
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 88119bb276aec5a5b5fd271a2ef6ebd8ad0fa042
Component: engine
2015-04-08 12:05:12 -07:00
moxiegirl aa0ffa1114 Merge pull request #11855 from nfirvine/master
Add some new graphics for mac installation with boot2docker
Upstream-commit: 26e83832c7cdffcc6547972f10b3f8d85497fa85
Component: engine
2015-04-08 10:41:50 -07:00
Doug Davis b3b1e4936b Remove Job from PS API
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1bfa80bdd9ac05b01867492d2e6dda668aa7715c
Component: engine
2015-04-08 10:30:17 -07:00
moxiegirl eeb5b1ee1d Merge pull request #12176 from YanFeng-Adam/typo
Fix a typo in /doc/sources/reference/run.md
Upstream-commit: ebc1e5ec9f25ba176bd30e08a26cb904d8009017
Component: engine
2015-04-08 10:08:05 -07:00
David Davis 5d49fb13f7 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>
Upstream-commit: f9d323d712cc0b9163dbe890a0ee20bda3b2087c
Component: engine
2015-04-08 12:57:19 -04:00
Arnaud Porterie 1ba10c92c9 Merge pull request #12178 from fschindler/fix-typo
Fixing typo.
Upstream-commit: b8a7fdade6351fc2201f8e7ca9b9416782852c4d
Component: engine
2015-04-08 09:10:53 -07:00
moxiegirl 49086235ff Merge pull request #12133 from xiaods/fixed-issue-11500
fixed #11500 Add tip about filter proxy
Upstream-commit: 254d6f7752dc325abe9e4a25fc80ab7887c72fde
Component: engine
2015-04-08 09:09:54 -07:00
Arnaud Porterie dbd59d6d0d Merge pull request #12168 from cpuguy83/remove_dup_file_creation
Remove duplicate config file creation.
Upstream-commit: a6d39e2a2de314be7f518a44df0505de8b6b65b4
Component: engine
2015-04-08 09:03:43 -07:00
Alexander Morozov c65fa515f2 Merge pull request #12066 from LK4D4/split_events
Remove engine usage from events
Upstream-commit: 3ebfc99d1057d841c1cdd4f19e80fceea5ab380e
Component: engine
2015-04-08 08:29:24 -07:00
Yan Feng c745cf0be5 Fix a typo in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 64fd944e30c8c045f6d998cc5ca950ea272541b5
Component: engine
2015-04-08 11:23:47 -04:00
Arnaud Porterie 97205a6be8 Merge pull request #12183 from runcom/remove-job-diff
Remove engine.Job from diff
Upstream-commit: 94ade35e4642bbb1579cc775b29ffdb7229819de
Component: engine
2015-04-08 08:21:43 -07:00
Antonio Murdaca f3e1f81e2d Remove engine.Job from diff
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e379e2668cecf8a0f9ef29eb57ee881f4d313d58
Component: engine
2015-04-08 15:52:10 +02:00
Doug Davis 24cbf276f9 Merge pull request #12132 from sunyuan3/d
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
Upstream-commit: 7cfe438151d29f9e8976d2ed7a2b0da834129eff
Component: engine
2015-04-08 08:09:22 -04:00
Felix Schindler b29d9ea376 Fixing typo.
Added missing white space.

Signed-off-by: Felix Schindler <fschindler@weluse.de>
Upstream-commit: 8afd5cad317920cceed7536d278974d9251b0325
Component: engine
2015-04-08 11:03:11 +02:00
Deshi Xiao bc64528286 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>
Upstream-commit: a40f37987859327c33643bb12067e3ece9e3294f
Component: engine
2015-04-08 14:13:01 +08:00
Yuan Sun 4c243c6e3e duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: cc30282e94546048a3957bdf360f99d4626e7d7c
Component: engine
2015-04-08 13:33:05 +08:00