Aaron Lehmann
f33fa1b8d3
Change push to use manifest builder
...
Currently this always uses the schema1 manifest builder. Later, it will
be changed to attempt schema2 first, and fall back when necessary.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-08 17:24:21 -08:00
Aaron Lehmann
c168a0059f
Update code to compile against new manifest interface
...
Also, digest.FromBytes no longer returns an error.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-08 17:24:20 -08:00
Aaron Lehmann
290ba41c00
Vendor updated github.com/docker/distribution
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-08 17:24:20 -08:00
Michael Crosby
2892de760f
Merge pull request #18840 from aaronlehmann/trust-messages
...
Send push information to trust code out-of-band
2016-01-08 16:56:57 -08:00
Michael Crosby
0a002f4ba8
Merge pull request #19199 from crosbymichael/migrate-errors
...
Fixed migrate defect, allow migrate the empty directory
2016-01-08 16:37:57 -08:00
andy
098fdb6408
Fixed migrate defect, allow migrate the empty directory
...
If there is an empty directory exists in the $DOCKER_ROOT/containers ,
that will cause migrate fail. Then docker daemon will initialize failed.
This commit allow skips the empty directory.
Signed-off-by: Andy Zhang <andy.zhangtao@hotmail.com >
Change error messages from uppercase to lowercase
Change error messages from uppercase to lowercase
Signed-off-by: andy <ztao@tibco-support.com >
2016-01-08 15:44:30 -08:00
Sebastiaan van Stijn
a082f80832
Merge pull request #18736 from WeiZhang555/tiny-lock
...
Break big lock into some tiny locks for containerStart
2016-01-09 00:35:26 +01:00
Alexander Morozov
807d575b5e
Merge pull request #19135 from Microsoft/jjh/securitywarning
...
Windows: Fix security warning regression
2016-01-08 13:55:41 -08:00
Tianon Gravi
335764a591
Merge pull request #19181 from coolljt0725/enable_build_syscall_test
...
Make .ensure-syscall-test to use build-arg
2016-01-08 13:43:38 -08:00
Jess Frazelle
719526d87c
Merge pull request #19186 from unclejack/no_mail_maintainers
...
CONTRIBUTING: add guidelines regarding email
2016-01-08 12:51:59 -08:00
Arnaud Porterie
05de2aadff
Merge pull request #19001 from aboch/pip
...
Allow user to choose the IP address for the container
2016-01-08 11:49:20 -08:00
Michael Crosby
e26974e20b
Merge pull request #19175 from cpuguy83/18670_copy_data_for_named_volumes
...
On create, copy image data for named volumes.
2016-01-08 11:33:40 -08:00
Aaron Lehmann
3f829aa6e4
Remove ansiescape package
...
api/client/trust.go was the last file that used it.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-08 10:57:50 -08:00
Aaron Lehmann
65370be888
Send push information to trust code out-of-band
...
The trust code used to parse the console output of `docker push` to
extract the digest, tag, and size information and determine what to
sign. This is fragile and might give an attacker control over what gets
signed if the attacker can find a way to influence what gets printed as
part of the push output.
This commit sends the push metadata out-of-band. It introduces an `Aux`
field in JSONMessage that can carry application-specific data alongside
progress updates. Instead of parsing formatted output, the client looks
in this field to get the digest, size, and tag from the push.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-08 10:57:50 -08:00
Jess Frazelle
1c979f7587
Merge pull request #18887 from riyazdf/notary-delegations
...
notary delegation integration into docker
2016-01-08 10:37:55 -08:00
Alessandro Boch
2bb3fc1bc5
Allow user to choose the IP address for the container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2016-01-08 10:09:16 -08:00
Alessandro Boch
19b063e740
Vendoring libnetwork
...
- 49c24217054e269aad3dbfd81ee32780b104dd84
Signed-off-by: Alessandro Boch <aboch@docker.com >
2016-01-08 09:19:31 -08:00
Riyaz Faizullabhoy
1c32a66877
update tests and error messages, revendor notary with tag
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-01-08 09:11:33 -08:00
unclejack
64e8fa9199
CONTRIBUTING: add guidelines regarding email
...
This adds guidelines around reaching the maintainers. Emails shouldn't
be sent to maintainers. GitHub mentions should be used instead.
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2016-01-08 16:49:17 +02:00
Vincent Demeester
3a8d694e01
Merge pull request #19180 from coolljt0725/fix_flaky_test
...
Fix flaky testTestStatsAllNewContainersAdded
2016-01-08 13:10:27 +01:00
Antonio Murdaca
018081d5a9
Merge pull request #19058 from dnephin/move_opts_to_runconfig_opts
...
Move some opts validators to runconfig/opts where they are used
2016-01-08 12:34:49 +01:00
Antonio Murdaca
f4f848b7a5
Merge pull request #19131 from cpuguy83/fix_plugin_error_handling
...
Don't error out on plugin err with json
2016-01-08 12:22:45 +01:00
Antonio Murdaca
9e9d7dc884
Merge pull request #19179 from estesp/btrfs-userns-perms
...
Fix btrfs subvolume snapshot dir perms for user namespaces
2016-01-08 12:13:49 +01:00
Lei Jitang
71d6e71cff
Fix flaky test TestStatsAllNewContainersAdded
...
Wait the new created container for running and then check if it
is in the docker stats to avoid flaky test.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-01-08 17:02:08 +08:00
Lei Jitang
3ff6725613
Make .ensure-syscall-test to use build-arg
...
.ensure-syscall-test need to build an image, we have
to add http_proxy and https_proxy to make it work.
Inseted of adding http_proxy and https_proxy env to the Dockerfile,
adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more
elegant.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-01-08 15:27:21 +08:00
Phil Estes
72e65e8793
Fix btrfs subvolume snapshot dir perms for user namespaces
...
Make sure btrfs mounted subvolumes are owned properly when a remapped
root exists (user namespaces are enabled, for example)
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2016-01-07 23:05:28 -05:00
cyli
1db0c7bb01
Add an integration test for docker being able to push to a repo with delegations.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
2016-01-07 19:35:45 -08:00
Riyaz Faizullabhoy
1c125f50cf
Notary delegation integration into docker
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-01-07 19:35:45 -08:00
Jess Frazelle
611d5e4eeb
Merge pull request #19173 from calavera/vendor_engine_api_0_1_2
...
Vendor engine-api 0.1.3
2016-01-07 19:19:19 -08:00
Brian Goff
b468332707
On create, copy image data for named volumes.
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-01-07 21:57:08 -05:00
David Calavera
e73ab750ed
Make sure docker api client implements engine-api client.
...
- Use the master interface in the new repo.
- Use new structures for container create, update and network connect.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-07 21:02:19 -05:00
David Calavera
1feeecf6e5
Vendor engine-api 0.1.3.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-07 21:02:19 -05:00
moxiegirl
6213cc9d04
Merge pull request #19165 from shishir-a412ed/man_page_fix
...
man page fix: remove -e/--exec-drive=native related description
2016-01-07 16:47:07 -08:00
moxiegirl
b12ef0fe00
Merge pull request #18378 from tonistiigi/content-addressability-storage-docs
...
Update storage docs for content-addressability
2016-01-07 16:44:29 -08:00
Jess Frazelle
d76640d78a
Merge pull request #19145 from vdemeester/vendor-my-precious
...
Add a validate-vendor script
2016-01-07 13:53:01 -08:00
Shishir Mahajan
50305d66f5
man page fix: remove -e/--exec-drive=native related description
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2016-01-07 14:21:01 -05:00
Doug Davis
ff3b551d2d
Merge pull request #18768 from hqhq/hq_remove_dup_error
...
Remove redundant error messages
2016-01-07 14:13:50 -05:00
Arnaud Porterie
cceac7da35
Merge pull request #19059 from jfrazelle/seccomp-docs
...
add syscalls we purposely block to docs
2016-01-07 11:13:07 -08:00
Vincent Demeester
4c22c566e2
Add a validate-vendor script
...
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-01-07 19:57:50 +01:00
Jess Frazelle
938d28e772
Merge pull request #19144 from LK4D4/fix_parent_systemd
...
Choose default-cgroup parent by cgroup driver
2016-01-07 10:24:51 -08:00
Jessica Frazelle
52f32818df
add syscalls we purposely block to docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-01-07 10:22:16 -08:00
moxiegirl
374a9596b2
Merge pull request #19156 from HackToday/19152-fix-voldoc
...
Remove the old reference link
2016-01-07 09:21:58 -08:00
Alexander Morozov
c1cd45d547
Choose default-cgroup parent by cgroup driver
...
It's "/docker" for cgroupfs and "system.slice" for systemd.
Fix #19140
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-01-07 08:56:26 -08:00
Tibor Vass
131e2bf12b
Merge pull request #19068 from calavera/vendor_engine_api
...
Introduce the new engine-api library.
2016-01-07 11:14:37 -05:00
Sebastiaan van Stijn
6aefa898cb
Merge pull request #19160 from thaJeztah/carry-19020-groupadd-docs
...
(carry 19020) add documentation for groupadd for remote api
2016-01-07 12:41:08 +01:00
Oliver Neal
ade71ace7d
added documentation for groupadd within hostConfig that was added in remote api 1.20
...
Signed-off-by: Oliver Neal <ItsVeryWindy@users.noreply.github.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-01-07 12:30:27 +01:00
Kai Qiang Wu(Kennan)
ca7b69016a
Remove the old reference link
...
Fixes : #19152
As issue #14214 closed, so this old link is not needed.
We can remove it now.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-01-07 10:23:36 +00:00
Sebastiaan van Stijn
3442339b98
Merge pull request #19090 from thaJeztah/fix-api-markdown
...
fix markdown and typos in API docs
2016-01-07 08:32:01 +01:00
moxiegirl
af6c6dbf87
Merge pull request #19115 from cpuguy83/volume_plugin_docs_change.md
...
Add docs for volume plugin ls/get
2016-01-06 20:04:09 -08:00
moxiegirl
dd2981c26d
Merge pull request #19127 from thaJeztah/use-the-f-luke
...
Add -f flag to cURL install instructions
2016-01-06 20:02:53 -08:00