Commit Graph
14858 Commits
Author SHA1 Message Date
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
moxiegirl f90dca15af Merge pull request #12508 from Mic92/docs-speedup
docs: speed up build by reducing build steps
Upstream-commit: 2bc3fb5149bdc3b63c338e76ed821d2d5444e9c1
Component: engine
2015-04-18 10:41:31 -07:00
Jörg Thalheim b527679d3d docs: speed up build by reducing build steps
- should be also easier to maintain

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bbe6df128802b22605f9eb079f105460ec78ac6f
Component: engine
2015-04-18 13:28:52 +02:00
Doug Davis 9132395dda Merge pull request #12438 from ourcolorfuldays/fixtypo
fix some typos
Upstream-commit: c158cdbe6f33667a49615c8ba1ff8e33e71d2228
Component: engine
2015-04-18 07:17:55 -04:00
Arnaud Porterie ad529b2798 Merge pull request #12466 from robertabbott/fix_dockerCmd
Removed unnecessary error output from dockerCmd
Upstream-commit: 5fd378c0d1d97601c7cfab6a62bb8da031a0001d
Component: engine
2015-04-17 15:15:34 -07:00
moxiegirl ad230ae4a5 Merge pull request #12496 from moxiegirl/post-release-updates
Updates to Compose docs and ENV vars
Upstream-commit: a313b729e48d0ca9d0085f407b136def162eaf4c
Component: engine
2015-04-17 13:43:06 -07:00
Mary Anthony f4a4f24956 Updates to Compose docs and ENV vars
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3a883672417fcb2b3ac0d57d992285849840bfb2
Component: engine
2015-04-17 13:08:57 -07:00
Brian Goff 41c63ff3d3 Merge pull request #12490 from LK4D4/carry_12396
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
2015-04-17 15:26:30 -04:00
Brian Goff 8a7669d466 Merge pull request #12493 from kostickm/12491-update-message-graphdriver
Updated message severity in graphdriver
Upstream-commit: 9922122fd467b3ba384801a059b05b00fd65998e
Component: engine
2015-04-17 14:53:45 -04:00
Megan Kostick 26d411e68d Updated message severity in graphdriver
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: cdc63ce5d032de593fc2fd13997311b316c0103b
Component: engine
2015-04-17 10:56:12 -07:00
moxiegirl 53ad166d48 Merge pull request #12476 from pwaller/small-cl-improvement
Improve build cancelation description in CHANGELOG
Upstream-commit: d12a2d8aeb483870ae064f70308e6ec7109f2a06
Component: engine
2015-04-17 10:34:08 -07:00
moxiegirl 969c19149d Merge pull request #12484 from superseb/12367-jessie-instructions
Added Debian 8 note for adding backports
Upstream-commit: 4492977437fe76e9984a5be2aba2c294c26b622b
Component: engine
2015-04-17 10:16:53 -07:00
moxiegirl 6715c2c5be Merge pull request #12470 from zembutsu/patch-1
fix typo
Upstream-commit: ced638094f138ef7f552da1d34c26e3f70eaa8ab
Component: engine
2015-04-17 09:55:56 -07:00
Simei He 0ff275f7b4 remove job from pull and import
Closes #12396

Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6e38a53f96403b4cbd38e49e6b294128ed054a20
Component: engine
2015-04-17 09:55:02 -07:00
Alexander Morozov cf639e2b30 Merge pull request #12486 from runcom/bye-builtins
Remove builtins
Upstream-commit: d845932a52ed7095490ead8dd9b17afb26c9b9ce
Component: engine
2015-04-17 09:52:43 -07:00
bobby abbott 5e15f55a29 Removed unnecessary error output from dockerCmd
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.

resolves #12355

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 621b601b3c602aab5ef0f07903fdf413881bb261
Component: engine
2015-04-17 09:11:14 -07:00
Sebastiaan van Steenis ca55f76013 Added Debian 8 note for adding backports
Signed-off-by: Sebastiaan van Steenis <mail@superseb.nl>
Upstream-commit: 37b9ce61ac5aa762cf0ad34d84bc1924807a7617
Component: engine
2015-04-17 16:32:28 +02:00
moxiegirl f99a495136 Merge pull request #12436 from hqhq/hq_fix_inspect_doc
update docker-inspect man page
Upstream-commit: ddc842ca2a556657e95036f8d23e3c81c9f60996
Component: engine
2015-04-17 06:57:12 -07:00
Antonio Murdaca 6488f10044 Remove builtins
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a0bf80fe0372196812a9cb295f209c08f8037601
Component: engine
2015-04-17 14:27:38 +02:00
Peter Waller e7b9b3570c Improve build cancelation description in CHANGELOG
The existing text didn't explain what had changed.

(See #9774)

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 609fa93aa2fd98f2eac30933623f15ece59e4527
Component: engine
2015-04-17 09:44:12 +01:00
bin liu 1e6d2d1fcb fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 70f1910a8bbeb3727829070a2454a636a91e2d48
Component: engine
2015-04-17 08:12:13 +00:00
Masahito Zembutsu 28d382563f fix typo
Is this typo?

Signed-off-by: Masahito Zembutsu <m.zembutsu@gmail.com>
Upstream-commit: 3cdf94ed1a8a63c068e17310ffa764230b280cbe
Component: engine
2015-04-17 16:06:54 +09:00
Doug Davis 9a1ff57e85 Merge pull request #12468 from icecrime/disable_test_pull_verified
Skip TestPullVerified
Upstream-commit: 5e40de92864009e7385300af1dd0a83bb4693126
Component: engine
2015-04-17 02:31:01 -04:00
Doug Davis 711b5f704b Merge pull request #12465 from HuKeping/log-level
Change log severity for non-tlsverify bind
Upstream-commit: d47f3707c566b74a3e71dde9a18c264a33009183
Component: engine
2015-04-17 02:10:47 -04:00
Hu Keping 9ae8147d1a Change log severity for non-tlsverify bind
closes #12459

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: b052f7a87cb73aa2b0d4827f6cf23b9eb0fdfa2e
Component: engine
2015-04-17 21:27:58 +08:00
Arnaud Porterie 7e8cef686e Skip TestPullVerified
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9a4fa9c19167756cf39a4d002efe81d4bcd3bb75
Component: engine
2015-04-16 23:05:47 -07:00
Doug Davis 52da95a5c0 Merge pull request #12446 from icecrime/please_go_away_testexp.tar
Always remove testexp.tar test file
Upstream-commit: 5207b3eb2b9894c282e46254b727aeee7e03e949
Component: engine
2015-04-17 01:58:29 -04:00
Arnaud Porterie e095f708fe Improve export/import tests cleanup
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4e356ee410e1abb86665ab15e4c4155d7c807866
Component: engine
2015-04-16 22:10:55 -07:00
Qiang Huang b54e42e0d3 update docker-inspect man page
- sort inspect out
 - update output fields
 - format output
 - add doc about go template
 - other minor fix

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 01548ed1dc25e94bf6cc7decca1d2045069dc5b1
Component: engine
2015-04-17 09:25:06 +08:00
moxiegirl a2f522bead Merge pull request #12455 from bfirsh/remove-registry-redirect
Remove registry redirect
Upstream-commit: 24af87835842b2683a3862f7a32c726013d2a67a
Component: engine
2015-04-16 17:55:02 -07:00
moxiegirl ea3916b969 Merge pull request #12383 from jdivock/patch-1
Upstream-commit: b8530c6c5eff289b8393dd18a4d778c280511097
Component: engine
2015-04-16 14:45:36 -07:00
moxiegirl ce41b2a8bf Merge pull request #12452 from moxiegirl/release-versions-set
Updating with final version from Stephen
Upstream-commit: 2ba1244ad261a85888ede933267038e362ab1a0f
Component: engine
2015-04-16 14:31:45 -07:00
moxiegirl 9839262e56 Merge pull request #12411 from sbasyal/patch-2
The link to issue 407 was broken
Upstream-commit: 96b5a3f562fd708fa3773acab4f358f83b97aeff
Component: engine
2015-04-16 13:32:02 -07:00
Phil Estes ea1d1ba304 Merge pull request #12454 from jfrazelle/bump_version
Bump version
Upstream-commit: 4325cbb47c77dac8968091c85d8737d0a14d1f43
Component: engine
2015-04-16 16:27:34 -04:00
Jessica Frazelle d7c7374f11 bump version to 1.6.0-dev
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: e79c77fb8d16ba38387e43fbf9224e341f252b95
Component: engine
2015-04-16 12:56:02 -07:00
Ben Firshman 960ca96c7d Remove registry redirect
... it was causing an infinite redirect.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 4c6d5e3a25557b2a053e8f8e5aafc84f5f6aada8
Component: engine
2015-04-16 12:54:56 -07:00
Jessica Frazelle fb913ffded Bump version to v1.6.0
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

(cherry picked from commit 47496519da9664202d900d3635bb840509fa9647)
Upstream-commit: 99d0413033e6ecf05a30eac18d51349ef859a9c7
Component: engine
2015-04-16 12:45:02 -07:00
Michael Crosby 168a9e925d Merge pull request #12428 from icecrime/1163_carry
Added documentation for functions
Upstream-commit: cb0644a196e0a91de50e81daa5fcf3b2645a8d45
Component: engine
2015-04-16 11:43:29 -07:00
Mary Anthony 917596f19e Updating with final version from Stephen
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b4b21ff0a6c45c1565c74e6f923b2c7e8ca565d6
Component: engine
2015-04-16 11:40:36 -07:00
Alexander Morozov 049ea91a21 Merge pull request #12407 from cpuguy83/move_integration_api_tests
Move some integration api tests
Upstream-commit: 27edbd2868c5e44d54c5a51ca220fa4cd568e17a
Component: engine
2015-04-16 11:40:29 -07:00
Jessie Frazelle ed720afd56 Merge pull request #12451 from moxiegirl/release-versions-set
doc fixes for 1.6
Upstream-commit: dfa5feab2fd31486f7e7bc532eac213dbaaea45d
Component: engine
2015-04-16 11:35:46 -07:00
Mary Anthony fdae7fc749 for 1.6
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f44aa3b1fbe5e042fee0fb78507ebac35eca3d04
Component: engine
2015-04-16 11:33:49 -07:00
Brian Goff b5835957f0 Move TestPostCreateNull to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 308a23021d65282cdf471ef0708ba5998b48c247
Component: engine
2015-04-16 13:49:46 -04:00
Brian Goff 6688a2d031 Move TestPostJsonVerify to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5dc02a2fa8819b3a61bcd5a6fedcfb1a5e64cba5
Component: engine
2015-04-16 13:49:28 -04:00
Brian Goff 3cb6dbb528 Move TestContainerApiCreate to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 23fa7d41d5510131cdf7883a930087ac4fb34187
Component: engine
2015-04-16 13:49:10 -04:00
Brian Goff 9e85fe7e11 Move TestPostCommit to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f19061ccfd526487391f7677bef7e1b38694d06a
Component: engine
2015-04-16 13:48:54 -04:00
Brian Goff 51eea9357f Move TestGetContainersTop to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d9e4b14346c6a93bee8c24803a8538dc2d74911d
Component: engine
2015-04-16 13:48:33 -04:00
Brian Goff f8e57bde88 Move SaveAndThenload to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6f5b895bc767585be9a8e1109672fb4946e56f15
Component: engine
2015-04-16 13:40:49 -04:00
Brian Goff c48f58ea6d Make sockRequestRaw return reader, not []byte
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8232cc777e329a47e123dbdc42411dae65288a80
Component: engine
2015-04-16 13:40:49 -04:00
Alexander Morozov 07ce310610 Merge pull request #12350 from runcom/remove-job-restart
Remove job from restart
Upstream-commit: 5224151da9cab6af4412d1dcdd81cf0cf76763f7
Component: engine
2015-04-16 10:27:43 -07:00