7a5549d8ea
Remove unused function from vfs storage driver
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
Upstream-commit: c1e04fbb150d71c243d505b79136108cb2f31f5c
Component: engine
2014-12-23 00:36:20 +01:00
12ac4f3199
Merge pull request #9615 from unclejack/bump_go_to_1.4
...
bump Go to 1.4
Upstream-commit: d09421a74fa268274c50308f2655e654949f505b
Component: engine
2014-12-22 15:07:57 -08:00
5364411768
Merge pull request #7003 from porjo/6034-fowardChain
...
Move per-container forward rules to DOCKER chain
Upstream-commit: 04117e4021da9d7fcd376b345074b84ebbd4f0ce
Component: engine
2014-12-22 14:40:42 -08:00
cd1df8aef7
Merge pull request #9284 from icecrime/client_only_integration_tests
...
Enable test-integration-cli for Windows platform
Upstream-commit: 4d0fcb64d25acc90fadc1a877464d815b575a509
Component: engine
2014-12-22 12:32:48 -08:00
10b295c1df
start new API v1.17 docs
...
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr >
Upstream-commit: 800a8e896e810019b625ad0161c4fc4a04c26845
Component: engine
2014-12-22 09:01:33 +01:00
bc1cbc1f63
Fix TestBuildWithTabs for go 1.4
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a31c14cadca4052a0a141347b322d825f56b814b
Component: engine
2014-12-21 13:49:45 +02:00
50a73ae598
Reinstall standard library with netgo
...
Fixes #9449
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6ac802ecd8e097f49c4b026fd7b5febfc683866c
Component: engine
2014-12-21 13:49:45 +02:00
88e70a98ec
bump Go to 1.4
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 62e8a93c3496791e8bfb2204f68b2a1cdf61fec9
Component: engine
2014-12-21 13:49:45 +02:00
d0893cb64b
Tidy driver.go/LinkContainers
...
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com > (github: porjo)
Upstream-commit: 38a595aec561b8a7b4325b6c1c4efd1b0b8e89c0
Component: engine
2014-12-21 13:42:02 +10:00
c1a6d58dbd
Update networking.md with new iptables behaviour
...
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com > (github: porjo)
Upstream-commit: 137ceae9138e535f8b3f4e76bda18f6db954c231
Component: engine
2014-12-21 12:57:32 +10:00
4b105a7583
Create tests for pkg/iptables
...
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com > (github: porjo)
Upstream-commit: 0da92633b4161ed1f8babe5ec4a9fe98257d34b5
Component: engine
2014-12-21 12:57:32 +10:00
ae55b92633
Create DOCKER forward chain on driver init
...
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com > (github: porjo)
Upstream-commit: 2865373894f1532fa725481e8f04db4a5d7a0aa8
Component: engine
2014-12-21 12:57:32 +10:00
c720d69487
Move per-container forward rules to DOCKER chain
...
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com > (github: porjo)
Upstream-commit: cc89b30d35edc02fc598a0b26fe7a1ed002238e4
Component: engine
2014-12-21 12:57:32 +10:00
e61e114873
Enable test-integration-cli for Windows platform
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f3ed42286e7df3a35ca41a4d19fab2a53a08b382
Component: engine
2014-12-20 16:40:40 -08:00
a2d81fbbe1
Merge pull request #9741 from tianon/test-docker-py
...
Add docker-py integration tests aginst the docker daemon
Upstream-commit: 0874f9ab77a7957633cd835241a76ee4406196d8
Component: engine
2014-12-19 11:57:35 -08:00
58481153fe
Merge pull request #9735 from tiborvass/fix-issecure-for-http-proxies
...
Handle unresolvable domain names in isSecure to allow HTTP proxies to work as expected
Upstream-commit: b88d9699ff7577e7d7a42ba4477cbfca45a953da
Component: engine
2014-12-19 14:53:48 -05:00
241c2f0465
Tweak test-docker-py feature
...
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 100267de81985bbf3b976bfde850def89487dc11
Component: engine
2014-12-19 10:47:01 -07:00
913aff3176
pkg/units: fix size_test.go compilation
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: e59aad9cd387bf20dc0f4664afdd5c55b394cb5b
Component: engine
2014-12-19 18:38:12 +02:00
ad1b9f394b
Merge pull request #9746 from unclejack/graphdb_fix
...
pkg/graphdb: use transactions for transactions
Upstream-commit: f7a449f92b88ca2a3db2fb33abade8c25a19c390
Component: engine
2014-12-19 11:11:59 -05:00
e2e02c60dd
pkg/graphdb: use transactions for transactions
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: e9f37a011872fa89669dc105df27e1c6e16124b6
Component: engine
2014-12-19 13:57:21 +02:00
c7d1f45ca3
Merge pull request #9233 from inatatsu/fix-pkg-units-size-for-gccgo
...
Fix to avoid a compile error due to float to int truncation with GCCGO
Upstream-commit: 2acb856dff848bd69c5e971f6352854a26362164
Component: engine
2014-12-18 18:33:01 -08:00
b66800136d
Merge pull request #9738 from jfrazelle/da-fuk-merge
...
Repeated word typo.
Upstream-commit: d6d2ff4df7100d219ed9d23d754a53913c1f1c43
Component: engine
2014-12-18 18:30:04 -08:00
93c395dffa
Merge pull request #9657 from moxiegirl/9655
...
Clarify Mac OS X experience. Signed-off by: Mary Anthony (moxieandmore@g...
Upstream-commit: 3e3749fe4b72c6fe9afd44c35c79c804b3ef1678
Component: engine
2014-12-18 21:29:02 -05:00
7600027e7b
I don't know how this happened, repeated word typo.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 29ed8a2289c932217c47b99cef3d91cbfc0d965e
Component: engine
2014-12-18 18:09:41 -08:00
11159bae89
registry: handle unresolvable domain names in isSecure
...
to allow HTTP proxies to work as expected.
Fixes #9708
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: ff4bfcc0e9f171a95dac5cc2650faacf73943057
Component: engine
2014-12-18 19:16:55 -05:00
3b8d2a3264
registry: add tests for unresolvable domain names in isSecure
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: a70d7aaf282948c6873c03031cee0704cbe86476
Component: engine
2014-12-18 19:16:55 -05:00
625be9e469
Merge pull request #8827 from jlhawn/build_implied_from_scratch
...
Make `FROM scratch` a special cased 'no-base' spec
Upstream-commit: 610842f906a942e9784bc16c201860dc89ba19ba
Component: engine
2014-12-18 18:21:16 -05:00
98bb6eba72
Make FROM scratch a special cased 'no-base' spec
...
There has been a lot of discussion (issues 4242 and 5262) about making
`FROM scratch` either a special case or making `FROM` optional, implying
starting from an empty file system.
This patch makes the build command `FROM scratch` special cased from now on
and if used does not pull/set the the initial layer of the build to the ancient
image ID (511136ea..) but instead marks the build as having no base image. The
next command in the dockerfile will create an image with a parent image ID of "".
This means every image ever can now use one fewer layer!
This also makes the image name `scratch` a reserved name by the TagStore. You
will not be able to tag an image with this name from now on. If any users
currently have an image tagged as `scratch`, they will still be able to use that
image, but will not be able to tag a new image with that name.
Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.
Fixes #4242
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 8936789919c5c8004f346f44a3452d1521818b60
Component: engine
2014-12-18 14:03:38 -08:00
014708a765
Merge pull request #9733 from unclejack/disable_tarsum_logging
...
pkg/tarsum: delete the logging code
Upstream-commit: 502a1a4e1a36cfcdd88139b0b35723e86d6198cf
Component: engine
2014-12-18 16:54:59 -05:00
5cdc9005f7
pkg/tarsum: delete the logging code
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: e7c0587d541cd9f224df622b2f97c918e68cfb05
Component: engine
2014-12-18 23:38:26 +02:00
f9482108f5
Merge pull request #9688 from dqminh/fix-make-tgz
...
make.sh tgz should handle windows binary
Upstream-commit: 1531bf48aa87b4a8336ab735ef025e83f09acac1
Component: engine
2014-12-18 13:16:32 -08:00
46b7cd5c49
Merge pull request #9720 from jlhawn/apply_diff_optimize
...
Refactor to optimize storage driver ApplyDiff()
Upstream-commit: e850568bf6f67b5fadd9767544b1cf7bc6fcc317
Component: engine
2014-12-18 11:58:47 -08:00
bdb7f879f7
Argghhh...I need to automate that signoff. Fixing lack of signoff
...
Signed-off-by: Mary Anthony <moxieandmore@gmail.com >
Upstream-commit: 801fd1af256134b749ee3dd29ea5ed41d2594482
Component: engine
2014-12-18 09:10:08 -08:00
4af408b6c1
Merge pull request #9635 from duglin/Issue3936
...
Allow for relative paths on ADD/COPY
Upstream-commit: 364720b5e7e725cdc466171de873eefdb8609a33
Component: engine
2014-12-18 06:58:50 -08:00
a9b8d39261
Allow for relative paths on ADD/COPY
...
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code
Closes : #3936
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f21f9f856e9d5af23521f131799028c2e67c04ed
Component: engine
2014-12-18 05:13:04 -08:00
9c05f0eaf9
Refactor to optimize storage driver ApplyDiff()
...
To avoid an expensive call to archive.ChangesDirs() which walks two directory
trees and compares every entry, archive.ApplyLayer() has been extended to
also return the size of the layer changes.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 35a22c9e12c05e2a0a205964702ced78ea39d7a1
Component: engine
2014-12-17 21:54:23 -08:00
0935b51529
Merge pull request #9181 from icecrime/allocate_daemon_ports
...
Allocate daemon listening ports
Upstream-commit: 21bba5d93a888e20d7fa8d7dd56efbdd1fd486c1
Component: engine
2014-12-17 18:01:20 -08:00
9667f960f7
Merge pull request #9683 from SvenDowideit/docker-exec-error-when-paused
...
Update the documentation for #9356 fix
Upstream-commit: f2b89166cf3d352298496ea19a7b72bf5b1cba54
Component: engine
2014-12-17 17:04:25 -08:00
f644595194
Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry
...
Scottstamp stale links pr carry
Upstream-commit: 5df189a1b0b63d66f1478e12e4e738e2378f26b0
Component: engine
2014-12-17 16:03:55 -08:00
bbde483637
Merge pull request #9715 from brahmaroutu/gccgo_power1
...
Fix to avoid a compile error due to float to int truncation with GCCGO
Upstream-commit: f1562ac658b859bc497a3eb76fe3333fe1240e98
Component: engine
2014-12-17 16:02:27 -08:00
85fa2dc157
redirect openSUSE docs to SUSE doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: de2a91970dfd1f6078179ffffd63ec1842c95bd9
Component: engine
2014-12-18 09:05:27 +10:00
7662fb34f6
Fix to avoid a compile error due to float to int truncation with GCCGO
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: c16e41245ebaf426a5ad27ebe82597647c7743a3
Component: engine
2014-12-17 22:44:55 +00:00
7e971053a8
Merge pull request #9711 from rhatdan/man
...
docker-run man page has screwed up indenting on --net option
Upstream-commit: 27b07bc39e45dd52562c2590b9e914282923e136
Component: engine
2014-12-17 14:14:47 -08:00
da3465e509
Add docker-py integration tests aginst the docker daemon
...
This clones and run the integration tests for docker-py master as part
of the integration tests created on master. docker-py hits the api
directly and should be a good way to identify regressions in the api.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5d6eca6642c5749099513f1f66bb44e004aa0938
Component: engine
2014-12-17 13:48:45 -08:00
401a4f9dcd
kr/pty: vendor upstream 05017fcccf
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 2524c0c5555f9127b4cd3d326430617f72979bab
Component: engine
2014-12-17 23:23:24 +02:00
21d58a4cf6
docker-run man page has screwed up indenting on --net option
...
This patch fixes the indenting.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: bc1507dfce956846ba1515ccbfcd202c06aa995b
Component: engine
2014-12-17 13:06:13 -05:00
c58b5b4ae4
Merge pull request #9703 from fredlf/1.4.1-docs-update
...
Additions for 1.4.1 release
Upstream-commit: f0f4e42375353dc04101bb7d0f263500f4d2d046
Component: engine
2014-12-17 21:13:04 +10:00
148e64f5bf
add binary extension to docker binary in tgz
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: ed7aa47dea9553a89e39c16397752ef0e791aab3
Component: engine
2014-12-16 22:55:29 -05:00
8f8a34a48e
Additions for 1.4.1 release
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6afe5bf9ede46b81fb63283c55488dbbc50d5a07
Component: engine
2014-12-16 17:40:02 -08:00
844e36c24a
Merge pull request #9701 from crosbymichael/registry-lookup-image
...
Change LookupRemoteImage to return error
Upstream-commit: 4988cde7b95437173be224cf1783bf5d7ef34074
Component: engine
2014-12-16 17:00:59 -08:00
