Victor Vieux
ffba4054dc
enable rescheduling watchdog only when primary
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-03-24 06:34:05 -07:00
Lei Jitang
d6ccc0e09f
Do not return error on hijacked connection for docker exec
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-03-24 08:52:13 -04:00
Xian Chaobo
dcf2608798
Merge pull request #1992 from dongluochen/AddNodeSpecUpdate
...
Periodically update node spec
2016-03-24 20:36:32 +08:00
Lei Jitang
cb5b8767b6
Cleanup: remove redundant period
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-03-24 08:26:04 -04:00
Vincent Demeester
2131558963
Merge pull request #21428 from estesp/reenable-shared-nstests-userns
...
Re-enable shared namespace tests for userns CI runs
2016-03-24 12:31:27 +01:00
Harald Albers
5b2c2e332f
bash completion for TLS options
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-03-24 12:06:10 +01:00
Harald Albers
9094c4d97d
prepare bash completion for new TLS options
...
Up to now there were two special top-level options that required special
treatment: --project-name and --file (and their short forms).
For 1.7.0, several TLS related options were added that have to be passed
to secondary docker-compose invocations as well.
This commit introduces a scalable treatment of those options.
Signed-off-by: Harald Albers <github@albersweb.de >
2016-03-24 12:05:59 +01:00
Antonio Murdaca
e73152bf27
integration-cli: fix wrong test and add log
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-03-24 11:10:41 +01:00
Ying Li
d60cdec18b
Merge pull request #586 from docker/ci-docker-test
...
Add script that "vendors" notary into docker and runs trust integration tests
2016-03-23 22:54:24 -07:00
Ying Li
376acc8ef8
Use GOPATH to figure out the docker and notary dirs in the fake vendor script
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 22:23:09 -07:00
Ying Li
a434db4064
Add script that "vendors" notary into docker and runs trust integration tests.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 22:20:38 -07:00
David Lawrence
7fe071b57a
Merge pull request #636 from docker/notary-dct-doc-update
...
Update notary docs to reflect DCT delegations behavior
2016-03-23 21:16:13 -07:00
Arnaud Porterie
b64627b798
Merge pull request #21457 from tonistiigi/update-runc
...
Update runc/containerd
2016-03-23 19:56:27 -07:00
Tonis Tiigi
8891afd838
Add ulimit support to libcontainerd addprocess
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-03-23 19:54:32 -07:00
Sebastiaan van Stijn
713cfffb5a
Merge pull request #21458 from crosbymichael/grpc-logs
...
Remove grpc logging to stderr
2016-03-23 19:50:25 -07:00
Sun Hongliang
3843dbb381
fix typos in /swarm/cluster/mesos/cluster.go
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io >
2016-03-24 10:49:28 +08:00
Brian Goff
55bbea3751
Merge pull request #21454 from anusha-ragunathan/fix_overlay
...
Move layer mount refcounts to mountedLayer
2016-03-23 22:39:38 -04:00
Sebastiaan van Stijn
5ef04b1c6d
Merge pull request #21268 from calavera/remove_dockerfile_from_api
...
Remove dockerfile dependency from the API.
2016-03-23 19:34:21 -07:00
Brian Goff
68674f739f
Merge pull request #21443 from calavera/fix_network_path_issue
...
Fix network path issue
2016-03-23 22:27:44 -04:00
Dong Chen
96980d954d
Skip unstable tests from Docker bug 14203.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-03-23 18:30:21 -07:00
Riyaz Faizullabhoy
be72081f84
Formatting and wording fixes from review
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-03-23 17:47:18 -07:00
Riyaz Faizullabhoy
68066cc857
Update notary docs to reflect DCT delegations behavior
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-03-23 17:47:17 -07:00
Richard Scothern
b787035d8b
Merge pull request #1545 from jonjohnsonjr/typos
...
Fix typos in docs/spec/api.md
2016-03-23 16:41:44 -07:00
Richard Scothern
87a997249d
Merge pull request #1522 from RichardScothern/tag-events
...
Send tag events to notification listeners
2016-03-23 16:41:29 -07:00
Sebastiaan van Stijn
3f568b19e8
Merge pull request #21430 from tophj-ibm/remove-seccomp-ppc64le
...
ppc64le: remove seccomp from Dockerfile
2016-03-23 16:36:29 -07:00
Nathan LeClaire
5239e6ed03
Merge pull request #3223 from ahmetalpbalkan/azure-known-issue
...
azure.md: Add known issue notice
2016-03-23 16:26:59 -07:00
Stephen Day
9e690c7fa2
Merge pull request #1491 from RichardScothern/relative-url
...
Return relative URLs
2016-03-23 16:19:39 -07:00
Richard Scothern
7e552e1972
Update documentation and examples in notifications.md
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2016-03-23 15:51:32 -07:00
Michael Crosby
b0280c37a0
Remove grpc logging to stderr
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2016-03-23 15:41:47 -07:00
Tonis Tiigi
22d997b374
Update runc/containerd
...
Contains fixes for:
- pid.max fix that is causing hang on network stats test.
- fix for early stdin close containerd-shim
- better logging for `could not synchronise with container process`
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-03-23 15:38:33 -07:00
Richard Scothern
bc9c820e4b
Enable URLs returned from the registry to be configured as relative.
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2016-03-23 15:14:32 -07:00
Victoria
2a09fb02db
Merge pull request #3182 from londoncalling/docs-fix-links-build-errors
...
fixed links showing as build errors per PR #3180
2016-03-23 15:08:25 -07:00
Victoria Bialas
d1ea4d72ac
fixed links showing as build errors per PR #3180
...
fixed links per build errors
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
2016-03-23 14:58:45 -07:00
Richard Scothern
afe2bdd1c5
Propogate tag as a functional argument into the notification system to attach
...
tags to manifest push and pull event notifications.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2016-03-23 14:57:52 -07:00
Nathan LeClaire
899206ced7
Merge pull request #3221 from nathanleclaire/dont_munge_bootlocal_on_restart
...
Prevent /var/lib/boot2docker/bootlocal.sh munging on restart
2016-03-23 14:47:15 -07:00
Brian Goff
65d79e3e5e
Move layer mount refcounts to mountedLayer
...
Instead of implementing refcounts at each graphdriver, implement this in
the layer package which is what the engine actually interacts with now.
This means interacting directly with the graphdriver is no longer
explicitly safe with regard to Get/Put calls being refcounted.
In addition, with the containerd, layers may still be mounted after
a daemon restart since we will no longer explicitly kill containers when
we shutdown or startup engine.
Because of this ref counts would need to be repopulated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-03-23 14:42:52 -07:00
Anusha Ragunathan
57ca2a2101
Fix use of mounted() in overlay.
...
Handle error and mounted case separately.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
2016-03-23 14:42:52 -07:00
David Calavera
82b9e60369
Merge pull request #21446 from cpuguy83/plugin_activation_issue
...
Fix panic in loading plugins
2016-03-23 14:25:35 -07:00
Ying Li
a6c0e7d5ab
Merge pull request #568 from docker/server-generates-snapshot-timestamp-immediately
...
Server generates snapshot and timestamp immediately
2016-03-23 14:13:47 -07:00
David Lawrence
26fbc45780
fixing a panic in relation to the json.RawMessage updates
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-03-23 13:40:38 -07:00
Ying Li
e8cdc32f0b
Clean up after rebase and address review comments
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
Ying Li
210eab829f
Error (and add tests for this) if the root in the server store is corrupt
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
Ying Li
3b80293a0c
Add test cases generating a timestamp from previous timestamps
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
Ying Li
433a298a8b
Simplify the validateRoot logic in server validators
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
Ying Li
c0796f17ef
Rename 'validateSnapshot' to 'loadAndValidateSnapshot' since it loads now
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
Ying Li
d3bb063fb2
Update the server to generate the timestamp on update, just like snapshot.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
Ying Li
1b919fac35
Change GetOrCreateSnapshot to only create a new snapshot if the old is expired.
...
This is in preparation for the server validation automatically generating a snapshot
when an update is applied.
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
Ying Li
49be037bdd
Change GetOrCreateTimestamp to only create a new timestamp if the old is expired.
...
This is in preparation for the server validation automatically generating a timestamp
when an update is applied.
Signed-off-by: Ying Li <ying.li@docker.com >
2016-03-23 13:24:52 -07:00
David Lawrence
9ff2558f81
unifying timestamp generation code so server/timestamp/timestamp.go isn't going its own unique version
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-03-23 13:24:52 -07:00
Aaron Lehmann
1354eb9967
Merge pull request #1554 from felixonmars/patch-1
...
Replace a strange comma with a space.
2016-03-23 13:03:52 -07:00