Commit Graph
22634 Commits
Author SHA1 Message Date
Aaron Lehmann f4d0dc32a0 Use RootFS from image config to register layers on Windows
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7450c258abe01585f861f4a1b5d2b97539dbbdce
Component: engine
2016-01-08 17:27:31 -08:00
Aaron Lehmann 6fca8512b5 Add integration test for pulling a manifest list
The test injects a synthetic manifest list into the registry blob store,
since there isn't a tool for pushing them yet.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: ad6c1b76497c4b39953b5af28f83a21a2eb36bf7
Component: engine
2016-01-08 17:27:31 -08:00
Aaron Lehmann 4d0b394b25 Build a pre-schema2 registry to test schema1 push/pull
Add DockerSchema1RegistrySuite which uses this registry, and make
applicable integration tests run as part of this suite.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 1fa2e3115105f6b2334f452bd08415e8f00633d7
Component: engine
2016-01-08 17:27:31 -08:00
Aaron Lehmann de6e714e78 Add support for manifest lists ("fat manifests")
A manifest list refers to platform-specific manifests. This allows
for images that target more than one architecture to share the same tag.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2bb8c85bc5e59d2f5a154b58bb9a4b6e86775a40
Component: engine
2016-01-08 17:27:31 -08:00
Aaron Lehmann 17eed595ac Add schema2 push support
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c8d277d228fbb4ec168a5d459c6e874cf9a872b3
Component: engine
2016-01-08 17:27:31 -08:00
Aaron Lehmann e149f9fc4c Add schema2 pull support
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 94726f7c7391d990d3d15f88ea20dbe8fe23c958
Component: engine
2016-01-08 17:24:21 -08:00
Aaron Lehmann c8cdbc5c42 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>
Upstream-commit: f33fa1b8d3befec31fdf1952ea1190012c812dc7
Component: engine
2016-01-08 17:24:21 -08:00
Aaron Lehmann fbe586aef3 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>
Upstream-commit: c168a0059f56507731e59c0264d96b5a74f93507
Component: engine
2016-01-08 17:24:20 -08:00
Aaron Lehmann 75cd536d3d Vendor updated github.com/docker/distribution
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 290ba41c00488b8c4ac2e5488bc1b040b758df75
Component: engine
2016-01-08 17:24:20 -08:00
Michael Crosby 5dc0139c60 Merge pull request #18840 from aaronlehmann/trust-messages
Send push information to trust code out-of-band
Upstream-commit: 2892de760f412360c5effef9cfc346f2d92eaa4c
Component: engine
2016-01-08 16:56:57 -08:00
cyli 03dfb7ff42 Re-vendoring notary in order to deal with a canonical JSON serialization issue.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 5719b136dec7b2c3e76059cf9226a1b388a772f6
Component: engine
2016-01-08 16:45:15 -08:00
Michael Crosby 8334f715ad Merge pull request #19199 from crosbymichael/migrate-errors
Fixed migrate defect, allow migrate the empty directory
Upstream-commit: 0a002f4ba813305a16f4ffb21488865601f0f18e
Component: engine
2016-01-08 16:37:57 -08:00
andy 8912ced795 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>
Upstream-commit: 098fdb6408e4e630c1c78b8283c4bc716cc46698
Component: engine
2016-01-08 15:44:30 -08:00
Sebastiaan van Stijn 7eedab5098 Merge pull request #18736 from WeiZhang555/tiny-lock
Break big lock into some tiny locks for containerStart
Upstream-commit: a082f8083212a50b5a3e40e2d2507b78e0a8e6a8
Component: engine
2016-01-09 00:35:26 +01:00
Euan 74e4071165 Increase integration cli test memory
Signed-off-by: Euan <euank@amazon.com>
Upstream-commit: ba19b6927fd79be4d676ff228128d72393cbf76a
Component: engine
2016-01-08 23:10:31 +00:00
Santhosh Manohar d8dc8b7d33 Docker changes for libnetwork vendoring..
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
2016-01-08 14:13:55 -08:00
Santhosh Manohar d53ca527b3 Vendoring libnetwork and its dependencies..
- replace /etc/hosts based name resolution with embedded DNS for user
  defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 8ccf5cffa7cd3cfd8e83fdaebc60a9f3d2473bcc
Component: engine
2016-01-08 14:13:21 -08:00
Alexander Morozov 12ab071eb0 Merge pull request #19135 from Microsoft/jjh/securitywarning
Windows: Fix security warning regression
Upstream-commit: 807d575b5ef1785ded1038dca2cfbf2afa2d5a0c
Component: engine
2016-01-08 13:55:41 -08:00
John Howard 8157f678e4 Windows CI: Deal with failing tests for TP4
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 25c383391a951e5bc9cb2f003ce69f119779fb2c
Component: engine
2016-01-08 13:49:43 -08:00
Tianon Gravi b4fe367544 Merge pull request #19181 from coolljt0725/enable_build_syscall_test
Make .ensure-syscall-test to use build-arg
Upstream-commit: 335764a5913900283a489ef771013041ffba7230
Component: engine
2016-01-08 13:43:38 -08:00
John Howard f999a9492a Windows CI: Turn off network API tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4c380010a6c001cda7cbe7184eb298ec885774ce
Component: engine
2016-01-08 12:58:54 -08:00
Aidan Hobson Sayers 7ad15b069e Fix ambassador script based on SvenDowideit/dockerfiles#37
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: cc44ea21e481d34ab9621afd6944b6c14a23106a
Component: engine
2016-01-08 20:55:22 +00:00
Jess Frazelle d3832b1ec4 Merge pull request #19186 from unclejack/no_mail_maintainers
CONTRIBUTING: add guidelines regarding email
Upstream-commit: 719526d87c17eb65cde9a95048252dd468df99f1
Component: engine
2016-01-08 12:51:59 -08:00
Stephen Rust e7064f1736 Allow external volume drivers to host anonymous volumes and copy existing data from image.
Signed-off-by: Stephen Rust <srust@blockbridge.com>
Upstream-commit: 7c70ad058f89701510ddbb9d9c5ed66d42626208
Component: engine
2016-01-08 15:06:42 -05:00
Phil Estes 898ac34e33 Move userns support out of experimental into master
Adds the `--userns-remap` flag to the master build

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 557c7cb888ad8e2f1f378c9cf34e5fba14551904
Component: engine
2016-01-08 15:06:22 -05:00
Arnaud Porterie 783f31c7b2 Merge pull request #19001 from aboch/pip
Allow user to choose the IP address for the container
Upstream-commit: 05de2aadff97be0ffe8a3ed0cf4ac363d291488f
Component: engine
2016-01-08 11:49:20 -08:00
Michael Crosby 3fbd578989 Merge pull request #19175 from cpuguy83/18670_copy_data_for_named_volumes
On create, copy image data for named volumes.
Upstream-commit: e26974e20b7e431b7c6e5a0dd4b7fe1b0127271f
Component: engine
2016-01-08 11:33:40 -08:00
Aaron Lehmann d2386de2d7 Remove ansiescape package
api/client/trust.go was the last file that used it.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3f829aa6e436dc741785abd795fdcd28afd2da40
Component: engine
2016-01-08 10:57:50 -08:00
Aaron Lehmann d54e9ca21b 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>
Upstream-commit: 65370be888d940899593a001024f53d6b83b4bb0
Component: engine
2016-01-08 10:57:50 -08:00
Jess Frazelle 61116ea963 Merge pull request #18887 from riyazdf/notary-delegations
notary delegation integration into docker
Upstream-commit: 1c979f758753d921ced122dec3953ddbc35ee67f
Component: engine
2016-01-08 10:37:55 -08:00
Alessandro Boch 7467c1af44 Allow user to choose the IP address for the container
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
2016-01-08 10:09:16 -08:00
David Calavera 219c1dc7e6 Vendor new syslog library with TLS support.
The syslog package in the stdlib is not maintained anymore.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 145f020122681d4868f717d64dfa556db22ac83d
Component: engine
2016-01-08 12:35:35 -05:00
Alessandro Boch f1d228a431 Vendoring libnetwork
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 19b063e740c8140c70bac65179f944422538babc
Component: engine
2016-01-08 09:19:31 -08:00
Riyaz Faizullabhoy 1ce594cbcd update tests and error messages, revendor notary with tag
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c32a66877f2ddc3f1cce66d78c69e032d6cf795
Component: engine
2016-01-08 09:11:33 -08:00
unclejack 1739126af0 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>
Upstream-commit: 64e8fa9199fb345e017c8ef5299ca69cee01ab4c
Component: engine
2016-01-08 16:49:17 +02:00
Lukas Waslowski caddcbad3d Improve docs for Daemon.TagImage and dockerfile.BuildFromConfig.
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
Upstream-commit: a4ce361ac8dc8c1a8d83b51c787986de256e2f69
Component: engine
2016-01-08 14:51:09 +01:00
Vincent Demeester c67324aed2 Merge pull request #19180 from coolljt0725/fix_flaky_test
Fix flaky testTestStatsAllNewContainersAdded
Upstream-commit: 3a8d694e01d8c3353f49a3f220ee861769f8b4a5
Component: engine
2016-01-08 13:10:27 +01:00
Antonio Murdaca 68fdf5d8eb Merge pull request #19058 from dnephin/move_opts_to_runconfig_opts
Move some opts validators to runconfig/opts where they are used
Upstream-commit: 018081d5a9acadb218e1284b11b200418aef5e0f
Component: engine
2016-01-08 12:34:49 +01:00
Antonio Murdaca 04c25bef6f Merge pull request #19131 from cpuguy83/fix_plugin_error_handling
Don't error out on plugin err with json
Upstream-commit: f4f848b7a55f142befd13b76803d7d884f815419
Component: engine
2016-01-08 12:22:45 +01:00
Antonio Murdaca 2f9e2cb95f Merge pull request #19179 from estesp/btrfs-userns-perms
Fix btrfs subvolume snapshot dir perms for user namespaces
Upstream-commit: 9e9d7dc8845cfa4bf46d46b8e0b68b16c8c038f7
Component: engine
2016-01-08 12:13:49 +01:00
Lei Jitang 1857956503 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>
Upstream-commit: 71d6e71cff4122a987a4655723d50a296916f523
Component: engine
2016-01-08 17:02:08 +08:00
Lei Jitang 6c33dca6bb 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>
Upstream-commit: 3ff67256132febad4d039845e97db2ad4d55025d
Component: engine
2016-01-08 15:27:21 +08:00
Lei Jitang b2c99ad7af Create the working directory on container creation
if create a container with -w to specify the working directory and
the directory does not exist in the container rootfs, the directory
will be created until the container start. It make docker export of
a created container and a running container inconsistent.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: cde0ed67a14e3983ba83af8c75434558c865b2bc
Component: engine
2016-01-08 12:11:21 +08:00
Phil Estes 6c383a05bb 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)
Upstream-commit: 72e65e87935e5b82de76a6ef9b8160900f4724b7
Component: engine
2016-01-07 23:05:28 -05:00
cyli f4511c75b9 Add an integration test for docker being able to push to a repo with delegations.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 1db0c7bb01863f859a193246a0474f9d1b4d6027
Component: engine
2016-01-07 19:35:45 -08:00
Riyaz Faizullabhoy b741751f8d Notary delegation integration into docker
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c125f50cfce422b19a15e84c5a3940890fb2e23
Component: engine
2016-01-07 19:35:45 -08:00
Jess Frazelle 083a35097b Merge pull request #19173 from calavera/vendor_engine_api_0_1_2
Vendor engine-api 0.1.3
Upstream-commit: 611d5e4eebc4c6153e49a319360df8de5bdd2e7c
Component: engine
2016-01-07 19:19:19 -08:00
Brian Goff 7d383f2b5f On create, copy image data for named volumes.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b4683327074d193428c724b153e8848ef2068c1d
Component: engine
2016-01-07 21:57:08 -05:00
David Calavera dbccbefa60 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>
Upstream-commit: e73ab750edc006324d1019b828c8ec9c551b9717
Component: engine
2016-01-07 21:02:19 -05:00
David Calavera 14985d55be Vendor engine-api 0.1.3.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1feeecf6e58c3690347efed9c0712a698ff426f0
Component: engine
2016-01-07 21:02:19 -05:00