Commit Graph
15279 Commits
Author SHA1 Message Date
Brian Goff 38db3bc7c2 Merge pull request #12647 from duglin/FixTesting
Remove old testing stuff that slipped into master
Upstream-commit: 6f94ca6d8b9e23dc33bdf6da520f0e585b3dedf9
Component: engine
2015-04-22 14:47:37 -04:00
Doug Davis 5f7ff29c8f Remove old testing stuff that slipped into master
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b4988d8d75b4ee915ade6013de76bb1336917528
Component: engine
2015-04-22 11:44:54 -07:00
Brian Goff ae1dbb3bcd Merge pull request #12623 from peggyl/api-client-docs
Fix golint errors in docker/api/client
Upstream-commit: 901ae9aaead770fade5b4367d775043cd9336076
Component: engine
2015-04-22 14:09:23 -04:00
Tianon Gravi f0797cd197 Merge pull request #12637 from sublimino/patch-1
Add kali to install script
Upstream-commit: 5728426f27eac479ffbb58bf886721fd84b9425f
Component: engine
2015-04-22 11:05:13 -07:00
Jessie Frazelle b22067113f Merge pull request #12634 from PeterDaveHello/patch-2
Use svg instead of png to get better image quality
Upstream-commit: fd3b722928613a194508e094535c8b0f3da9967a
Component: engine
2015-04-22 10:53:47 -07:00
Ankush Agarwal e6ff00789e Update with @moxiegirl's patch and add direct config
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9689aab5ec0141a70c2134d18cb581ec5a923c5f
Component: engine
2015-04-22 10:36:38 -07:00
Antonio Murdaca 766ebf1059 Fix TestEventsImageImport racy, fixes #12499
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: eeb8ceb9edb61f4b8889360e4c4a2c4250c2d9f6
Component: engine
2015-04-22 17:30:30 +02:00
Andrew Martin a1213158fa Add kali to install script
https://www.kali.org/ is a Debian derivative. This script completes
succesfully using the Debian install path

Signed-off-by: Andrew Martin <sublimino@gmail.com>
Upstream-commit: 2dd88af79b0e1af6df0551b993cd9fffbd5881ee
Component: engine
2015-04-22 14:56:00 +01:00
Peter Dave Hello 3fb10b1144 Use svg instead of png to get better image quality
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
Upstream-commit: b121d94369164391369cd02a559a7b64b482f59d
Component: engine
2015-04-22 18:45:29 +08:00
Peggy Li ed4e61e70a Fix golint errors in docker/api/client
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
Upstream-commit: 58065d0dd9adec4b2f397a453652cc8cc7237a17
Component: engine
2015-04-22 00:14:23 -07:00
Gosuke Miyashita 78da009c7c Append icc related iptables rules, not INSERT
Signed-off-by: Gosuke Miyashita <gosukenator@gmail.com>
Upstream-commit: 90a8e45604f42d60d58b4cefa37a5e5d3112b64a
Component: engine
2015-04-22 11:45:46 +09:00
Mary Anthony 18e1b423ee Fixing a few links in registry
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 54ff1dcb829e67d62dd4686bdc19522d63c3e0d3
Component: engine
2015-04-21 18:36:37 -07:00
Ankush Agarwal 6284903b5f Add Configuring Docker article [WIP]
Fixes #12088

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9424fc14bb7465f9874e6e3560cf62b560dbd13d
Component: engine
2015-04-21 17:49:29 -07:00
Qiang Huang 3a0cec3089 remove redundant warning
And warning is not supposed to have a prefix WARNING.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f3dc35169780e1555b4116986649b729cb80b5d1
Component: engine
2015-04-22 08:15:00 +08:00
Brian Goff 1b7f0b8878 Merge pull request #12611 from LK4D4/remove_eng_chain_pull
Remove chain of engine passing from builder to loadManifest
Upstream-commit: ccbb93e1cd38ad0a38455ad054b170f444aa9da3
Component: engine
2015-04-21 19:19:56 -04:00
Arnaud Porterie be3d252948 Merge pull request #12511 from LK4D4/gocheck_suites
Gocheck suites
Upstream-commit: 61854b171d1e8afbbc30f268e793356996ff4c77
Component: engine
2015-04-21 15:42:33 -07:00
Alexander Morozov 43e79cc411 Remove chain of engine passing from builder to loadManifest
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a2f74aa4b449479dc3953b129c839ca90b089494
Component: engine
2015-04-21 14:55:23 -07:00
Mary Anthony a499d975cf Putting into our new format for cloud
Adding in Seb's comments
Updating with Fred's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: bc7a43cb44fc0541939f10186e326e3139403605
Component: engine
2015-04-21 14:48:48 -07:00
Fred Lifton 60a0268238 Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc
Remove some unsupported instructions in the docs.
Upstream-commit: 21c8d211e1bd508091c1dfecb29a32988ac2a17a
Component: engine
2015-04-21 14:08:31 -07:00
Alexander Morozov 79e92cb2ff Merge pull request #12567 from brahmaroutu/integration_test6_12255
moving integration tests to graph unit tests
Upstream-commit: 7ba8c3b26ffedc869c2868c3e90ef81315af6b8f
Component: engine
2015-04-21 13:58:02 -07:00
Brian Goff b383a47d39 Merge pull request #12600 from LK4D4/remove_image_set
Remove image_set engine job
Upstream-commit: 725ea8c09ef974d85f562919b6610354069e0cde
Component: engine
2015-04-21 16:51:46 -04:00
Brian Goff b6c443e015 Merge pull request #12564 from LK4D4/remove_jobs_trust
Remove engine from trust
Upstream-commit: b098a42559f8f70a56a587a06608ee00641ebdaf
Component: engine
2015-04-21 16:49:01 -04:00
Alexander Morozov 490d3d47ba Merge pull request #12609 from runcom/remove-not-needed-readHostConfig
Remove not needed call to container.readHostConfig()
Upstream-commit: 783dbcade36fa3816ad4be817b62bd53b74b9080
Component: engine
2015-04-21 13:45:48 -07:00
Alexander Morozov 95350b9286 Remove image_set engine job
It was unused

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 79a7fedcd8f9aaa42ec4e7f0fdd1f915c27e850b
Component: engine
2015-04-21 13:04:28 -07:00
Antonio Murdaca 7c675b1db2 Remove not needed call to container.readHostConfig()
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a3c4801c9291c0db78c5cc0748d5d2dd5e44a98f
Component: engine
2015-04-21 22:00:33 +02:00
Ankush Agarwal b0e45c14c4 Add Image Digest doc in userguide/dockerimages
Fixes #12551

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: a4676503d9531b50b26643df5ea3975bdec6b4df
Component: engine
2015-04-21 12:47:09 -07:00
Doug Davis d704315a4a Merge pull request #12601 from runcom/remove-job-image-get
Remove job image_get
Upstream-commit: b807ac111577142f40f1127b1ab7b1924cca54cd
Component: engine
2015-04-21 15:31:42 -04:00
Antonio Murdaca c53bd31df2 Remove job image_get
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: d07fe1836579b0d55813cae8736be31a2891501a
Component: engine
2015-04-21 21:01:09 +02:00
Brian Goff 2ee6cd28f5 Merge pull request #12604 from runcom/remove-job-image-tarlayer
Remove job image_tarlayer
Upstream-commit: 6f82613ded38eb39025aebfbc1d6846c087474e5
Component: engine
2015-04-21 14:53:54 -04:00
Antonio Murdaca 16933141bf Remove job image_tarlayer
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ba0017595ed9ac30273832b93365b0cb1cf60c05
Component: engine
2015-04-21 19:59:45 +02:00
Alexander Morozov 1884ef3b9b Use suite for integration-cli
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
2015-04-21 10:28:52 -07:00
Alexander Morozov 36fe7b2098 Add gocheck to vendored deps
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6dcdf832a3dddc8de17b7f8b1fb1ddb8b20f9077
Component: engine
2015-04-21 10:28:52 -07:00
Dan Walsh b04ccc089c Add journald as a supported logger for containers
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 364287b74118de4f04d049426ef37fa9936d2065
Component: engine
2015-04-21 12:57:54 -04:00
Alexander Morozov 17f801b987 Merge pull request #12598 from runcom/remove-writeJSONEnv
Remove writeJSONEnv, fixes #12597
Upstream-commit: 371b39c26f3770af8c63162b927b07207764f4b5
Component: engine
2015-04-21 09:54:55 -07:00
Antonio Murdaca e46db750a1 Remove writeJSONEnv
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 27811355bd15dd2d0f102dd3b02512c677d5da44
Component: engine
2015-04-21 18:14:39 +02:00
James Turnbull 420c9f4038 Merge pull request #12563 from kentoj/patch-1
Clarify data volume init with existing data
Upstream-commit: afd56364618c8c638769a8e9fceeaa5376e46ff5
Component: engine
2015-04-21 08:57:22 -07:00
Jörg Thalheim f62791a8aa Dockerfile: download go libraries before copy vendor
When ever something vendor/ changes the go dependencies have to downloaded again,
which requires internet access and there for is potential slow. COPY and go install is much faster, while the git urls does not change not this often.

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: f731b01483ed7010824c5951cc4a27db907c2d47
Component: engine
2015-04-21 11:41:09 +02:00
Jessie Frazelle cff18dc122 Merge pull request #10736 from coolljt0725/add_cpu_limit
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
2015-04-20 17:55:01 -07:00
Tianon Gravi c4f89f8977 Merge pull request #12181 from inatatsu/enable-netgo-with-gccgo
Enable "netgo" library when we build with gccgo
Upstream-commit: e562495d56bf0fb329bc1f28445faad6934149e8
Component: engine
2015-04-20 17:31:49 -07:00
Jessie Frazelle 23af23a14a Merge pull request #12430 from icecrime/11551_carry
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
2015-04-20 17:28:24 -07:00
Jessie Frazelle bf5cc9f8c8 Merge pull request #12457 from calavera/remove_engine_job_builder
Remove engine.Job from Builder.
Upstream-commit: 82f75df9e9faceabd9a2653ac57ad17aeab5e44b
Component: engine
2015-04-20 17:27:17 -07:00
Jessie Frazelle 40cdee7b30 Merge pull request #12517 from mavenugo/master
Enhanced port integration-cli tests
Upstream-commit: 874d64e690338a7aba3e8e4ecff793f1893bdb9d
Component: engine
2015-04-20 17:26:48 -07:00
Jessie Frazelle 27af7aa804 Merge pull request #12539 from WeiZhang555/httpError
change httpError logic
Upstream-commit: 4bb8924b52a4d8a25ccfcd39a43e7ba22b393424
Component: engine
2015-04-20 17:26:09 -07:00
Jessica Frazelle f0d8d3abd1 actually depreciate -rm, -sig-proxy, -name, seriously its been forever
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: f3d4c33213088ce3c381156760064f07da76de30
Component: engine
2015-04-20 17:20:23 -07:00
Jessie Frazelle a2ec388af9 Merge pull request #12533 from ankushagarwal/gofmt-directory
gofmt 1.4.2  src directory
Upstream-commit: 4a25c5d25bad693f9e79a810d87f9103769f918c
Component: engine
2015-04-20 17:02:43 -07:00
Jessie Frazelle df94aca214 Merge pull request #12566 from fntlnz/remove-go1.3.3-support
Removed go1.3.3 support
Upstream-commit: e1fd7e25de4574b78cce41becd8ee50bdff23f0c
Component: engine
2015-04-20 17:01:57 -07:00
Jessie Frazelle 6f3bec0db9 Merge pull request #12471 from coolljt0725/fix_weird_output_format
Fix weird terminal output format
Upstream-commit: df217120cdc2336181eb3c97fea5acd18ede4ed0
Component: engine
2015-04-20 17:01:02 -07:00
Jessie Frazelle 5bf4abe6b6 Merge pull request #12568 from duglin/TweakConfigPerms
Make .docker dir have 0700 perms not 0600
Upstream-commit: fcacb1793e54fd30055efc940737ee2ba1fb49f1
Component: engine
2015-04-20 16:33:10 -07:00
Jessie Frazelle 5a2fc18d12 Merge pull request #12556 from icecrime/update_release_checklist
Update release checklist
Upstream-commit: 23ec4cab60c749bef7222beb131fa54aed1d9ad4
Component: engine
2015-04-20 16:31:40 -07:00
Arnaud Porterie 77ca39f0a0 Early API version bump
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: a8253ec7e7ec13c81d5195ddfe3cf2571ce6afff
Component: engine
2015-04-20 15:52:26 -07:00