d41faf6fe1
Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
...
update release script and release process
Upstream-commit: 8b9856dbd7a1981aaa76fcf0fc10b37d1141c9af
Component: engine
2015-11-12 09:51:36 -08:00
374d554d86
Merge pull request #17901 from runcom/remove-not-needed-func
...
hack: make.sh: remove not used function
Upstream-commit: eed704f7d933364e68cf29bcd4ed0e3591fd4b6b
Component: engine
2015-11-12 07:16:43 -08:00
7fb35a1e4a
hack: make.sh: remove not used function
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: dc41fff56eb85552c38716533b2cd982d6e02f40
Component: engine
2015-11-11 10:19:03 +01:00
789bc1f38f
Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 43b3b6ecb4f838023478c484d32957386b7dd666
Component: engine
2015-11-10 21:13:25 -08:00
320a0d9081
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
Upstream-commit: 09980ef7ac2510cc67e160657f0829a47f5b5b28
Component: engine
2015-11-10 23:38:33 -05:00
542df63133
Fix link to installation instructions
...
Fix #17872 :
> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/ , which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/ .
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com >
Upstream-commit: c5f24c7902df5a48258056e799952200f250c5f2
Component: engine
2015-11-10 18:06:58 +01:00
62ba8c349b
Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
...
- To bring in ip-range fix
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 9c395537bce1e787ae34d90b2de81df3a47c5ff9
Component: engine
2015-11-09 15:29:54 -08:00
2f262fa249
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
2015-11-09 13:15:50 -08:00
094e7a47db
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
Upstream-commit: e509fe604c51cffb480098c4377c60bea1261fb1
Component: engine
2015-11-09 19:59:18 +01:00
48001c30bb
dockerversion placeholder for library import
...
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8054a303870b81eebe05e38261c1b68197b68558
Component: engine
2015-11-09 19:32:46 +01:00
7eead35e44
Update runc to introduce RelabelNeeded function
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 00bcc924fa64b16484beeeabbd2969572d03d30d
Component: engine
2015-11-09 10:03:25 -08:00
e5d27b4461
Remove DOCKER_EXECDRIVER env
...
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.
Signed-off-by: Lei Jitang <leijiang@huawei.com >
Upstream-commit: 3c4dab51d33f6e90c45de83c01474bc60aee3766
Component: engine
2015-11-09 09:17:32 +08:00
103e2de74a
Merge pull request #16533 from justsml/LMDEv2
...
LMDE check added to `check_forked()` function - See #16498
Upstream-commit: ea59233eb1fda209d48e11bab10f4cfd2ffe9914
Component: engine
2015-11-08 02:28:11 -08:00
9d71a73335
Merge pull request #17786 from Microsoft/10662-nativetestunit
...
Windows: Native make test-unit
Upstream-commit: e2a9eede2800144651dd2efe335e4bf386b9fd83
Component: engine
2015-11-08 11:12:09 +01:00
975dc00b97
Windows: Native make test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7268f767e6d7d1067c896a959654cf493bc5b073
Component: engine
2015-11-07 08:23:10 -08:00
83dc9caccd
Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild
...
Windows: Native build without link errors
Upstream-commit: efc7b9bbf7434aef067ad27cb6ba47f8f14ddf5d
Component: engine
2015-11-07 08:22:35 -08:00
10a453a65f
Windows: Native daemon build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d92f7f42b22e2cfd1ca751824f907357d8143a3d
Component: engine
2015-11-06 15:35:56 -08:00
cddc489efe
Windows: Fix test-unit for local run
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 33faea576ffbd0e86d1f0f53876620f9e4d9b63f
Component: engine
2015-11-06 15:23:48 -08:00
13125ff6b4
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
b31d380f40
Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
...
Fix panic in parsing /etc/os-release
Upstream-commit: 98ec6bc14c165a06cf510ca5714ce4e831d405e6
Component: engine
2015-11-05 15:11:02 -08:00
f427a47755
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
4925d54787
Merge pull request #17496 from chasebolt/centos-rpm-dep
...
setting device-mapper-libs version dependency for centos 7 rpm
Upstream-commit: 31fa27d47ead9d3be08338a748ee9cc21c085183
Component: engine
2015-11-05 13:46:27 -08:00
97dac59e9f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b09a452c1f89e84b513ed7eaf567437291e0e50d
Component: engine
2015-11-05 19:59:28 +01:00
0e4d37bec5
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
Upstream-commit: f267e4be54170855693d240e605ff9a4ee8e891d
Component: engine
2015-11-05 12:11:57 +01:00
5805b4b796
update release script and release process
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d0a4b216a68d0ea27b4604330ed779fa5ed96c35
Component: engine
2015-11-04 16:20:04 -08:00
bedb26558b
add script to test the old apt-repo
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 3f2747943583c06dc3ee1744a5ffa4ce7c099c7c
Component: engine
2015-11-04 16:01:19 -08:00
a73cd6bc2a
Merge pull request #17639 from mrjana/restart
...
Fix a corner case issue when daemon panics
Upstream-commit: b2f14f9bec0c4c8f14e9ac5446fbb49d88310bae
Component: engine
2015-11-04 13:37:45 -08:00
13774a5b6d
after the changes to unit test framework, fixing gccgo to run unit tests
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 81b3d2eec9d107e7bb6e839ca3506f0bf9dee9db
Component: engine
2015-11-03 17:57:06 +00:00
bafe2d42bf
Fix a corner case issue when daemon panics
...
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.
Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 79cffa5ce4a71b29eed66e26c1fb7f153be5c045
Component: engine
2015-11-02 18:37:35 -08:00
e8b4f63208
Merge pull request #17557 from aaronlehmann/update-distribution
...
Vendor updated version of docker/distribution
Upstream-commit: 6964f4235035c5e94f6a0c35149783e910fed313
Component: engine
2015-11-02 14:37:04 -08:00
bf1b372cbc
Vendor updated version of docker/distribution
...
This updates the vendored docker/distribution to the current master
branch.
Note the following changes:
- The manifest package was split into manifest/schema1. Most references
to the manifest package in the engine needed to be updated to use
schema1 instead.
- Validation functions in api/v2 were replaced by the
distribution/reference package. The engine code has been updated to
use the reference package for validation where necessary. A future PR
will change the engine to use the types defined in
distribution/reference more comprehensively.
- The reference package explicitly allows double _ characters in
repository names. registry_test.go was updated for this.
- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
that the schema1 package unmarshals the correct payload. The test is
being changed to modify the JSON without affecting its length, which
allows the pull to succeed to the point where digest validation
happens.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 257c59251bd9a03aea4f3188a8160c54f37950ae
Component: engine
2015-11-02 12:40:18 -08:00
88f746d118
Merge pull request #17619 from jfrazelle/canonical-update
...
rebased canonical/json off go 1.5.1
Upstream-commit: b95048758a06097469901590e68f40bafb5d1762
Component: engine
2015-11-02 11:42:26 -08:00
dd117ef001
Merge pull request #17620 from vdemeester/unit-test-TESTDIRS
...
Bring TESTDIRS back for unit-tests
Upstream-commit: f962c0715f153b806742cefaa6e9c9adf4e25273
Component: engine
2015-11-02 11:41:19 -08:00
b9cfc706d4
Add TESTDIRS back
...
Makes it simpler to test only one package.
Was removed by #17491 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4a54ab387f4b11310476414f575fb2502970b65d
Component: engine
2015-11-02 19:44:09 +01:00
9601e97681
rebased canonical/json off go 1.5.1
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0d881349e88b55a3ea4e15eef1c464b2ca64a441
Component: engine
2015-11-02 10:23:02 -08:00
106476f022
Vendoring libnetwork
...
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 10e1b9f02ee633349bc45631dac18cb4cc5baa61
Component: engine
2015-11-02 08:33:52 -08:00
cc98d1ba33
Vendoring in libnetwork to fix an ungraceful restart case
...
Also picked up a minor typo fix
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2361edbcea22113aea639a3d74edb35791fd8aef
Component: engine
2015-10-30 16:24:02 -07:00
d73613b841
Merge pull request #17514 from mavenugo/ugr
...
Fixing a case of dangling endpoint during ungraceful daemon restart
Upstream-commit: 17a8fbeaebf1991fa8d97adb3f217edbecd651ea
Component: engine
2015-10-30 13:38:27 -04:00
9514b66cfb
Merge pull request #16640 from samuelkarp/awslogs-logging-driver
...
[awslogs] Auto-detect region and set user-agent
Upstream-commit: c545dce004a4b833994478a2fc993ee8e2b3b2cd
Component: engine
2015-10-30 12:38:40 -04:00
8c783d1695
Vendoring libnetwork to solve an ungraceful restart condition
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ebf76171f6d63938558cdd5bef33565b48d664b7
Component: engine
2015-10-29 18:56:17 -07:00
ff7c252b26
Merge pull request #17491 from LK4D4/seq_tests
...
Run unit tests as single command
Upstream-commit: d30caedbf8860b0cc07aa2429ca20dafb5e918e2
Component: engine
2015-10-29 16:29:24 -07:00
873a58e636
expand the list a bit more
...
Signed-off-by: Chase Bolt <chase.bolt@gmail.com >
Upstream-commit: d8aaf962169e2c6070d178bb754b0171b45e2328
Component: engine
2015-10-29 15:23:44 -07:00
f8757c11b0
Merge pull request #17490 from aboch/pm
...
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -07:00
9a9584b78d
setting device-mapper-libs version dependency for centos 7 rpm
...
Signed-off-by: Chase Bolt <chase.bolt@gmail.com >
Upstream-commit: 787d94626febc306f5f0340af40c085b9a41f614
Component: engine
2015-10-29 11:11:19 -07:00
691e7791f8
Run unit tests as single command
...
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1c23de0e64887f6c36b2156dd65717f723493775
Component: engine
2015-10-29 09:39:51 -07:00
4a8db513f4
Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 90744fe9432d988bae187a8dab7c606b2dc13895
Component: engine
2015-10-29 09:24:48 -07:00
0317f9b3fb
Merge pull request #16898 from hqhq/hq_bump_bolt
...
Bump bolt to v1.1.0
Upstream-commit: b6e1f4dd69a865df847dd4f6efe12df21f5c34dd
Component: engine
2015-10-28 18:51:23 -04:00
b78e8b7756
docker-py: upgrade and fix test script
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
2015-10-28 12:56:50 -04:00
72e420120c
Merge pull request #17418 from diogomonica/bump-go-1.5
...
Bump go 1.5
Upstream-commit: 96a6e810de0bfabe6cc59588f237470810703656
Component: engine
2015-10-27 20:12:43 -07:00
