Commit Graph

4706 Commits

Author SHA1 Message Date
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
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
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
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
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
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 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
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
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
Doug Davis 3dff9074e8 Merge pull request #18768 from hqhq/hq_remove_dup_error
Remove redundant error messages
Upstream-commit: ff3b551d2d9c3f955509504b3cfc629c660909cb
Component: engine
2016-01-07 14:13:50 -05:00
Brian Goff 20a5900d4d Build names and links at runtime
Don't rely on sqlite db for name registration and linking.
Instead register names and links when the daemon starts to an in-memory
store.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0f9f99500c40f2a46682967ca358cd2346fd5e13
Component: engine
2016-01-07 14:10:42 -05:00
David Calavera 4ec2693c9e Modify import paths to point to the new engine-api package.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb
Component: engine
2016-01-06 19:48:59 -05:00
John Howard 30a8d72704 Windows: Fix security warning regression
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ebf4c917170215663157f028798e0244040b6be3
Component: engine
2016-01-06 15:54:43 -08:00
Jessica Frazelle 4d9fdc3032 fix proc regex
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 2b4f64e59018c21aacbf311d5c774dd5521b5352
Component: engine
2016-01-06 10:08:35 -08:00
Doug Davis 69f0af2128 Add default PATH to 'scratch' images
Closes #19012

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d3ea7e80e879b506bddffd51c3ab65b8078a34f4
Component: engine
2016-01-06 09:50:35 -08:00
Brian Goff db1910a30c Move responsibility of ls/inspect to volume driver
Makes `docker volume ls` and `docker volume inspect` ask the volume
drivers rather than only using what is cached locally.

Previously in order to use a volume from an external driver, one would
either have to use `docker volume create` or have a container that is
already using that volume for it to be visible to the other volume
API's.

For keeping uniqueness of volume names in the daemon, names are bound to
a driver on a first come first serve basis. If two drivers have a volume
with the same name, the first one is chosen, and a warning is logged
about the second one.

Adds 2 new methods to the plugin API, `List` and `Get`.
If a plugin does not implement these endpoints, a user will not be able
to find the specified volumes as well requests go through the drivers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d3eca4451d264aac564594fe46b8c097bd85a5cc
Component: engine
2016-01-05 16:28:38 -05:00
Phil Estes 156d67e60e Merge pull request #18889 from aaronlehmann/v1-fallback-pull-all-tags
Allow v1 protocol fallback when pulling all tags from a repository unknown to v2 registry
Upstream-commit: 6c30931b06ff44e1ce002002430577b7135d2049
Component: engine
2016-01-05 16:20:04 -05:00
Anusha Ragunathan f688b73835 Use ImageBuildOptions in builder.
dockerfile.Config is almost redundant with ImageBuildOptions.
Unify the two so that the latter can be removed. This also
helps build's API endpoint code to be less dependent on package
dockerfile.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5190794f1d85d5406611eb69c270df62ac1cdc7f
Component: engine
2016-01-05 10:09:34 -08:00
Alexander Morozov 0c89fbf389 Add ability to set cgroup parent for all containers
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2e3186ab065a7130a6e6267d86750848d5eb7d80
Component: engine
2016-01-04 15:16:25 -08:00
Michael Crosby 89d18d78c9 Merge pull request #18208 from cpuguy83/restart_links
Daemon Restart: attempt to wait for container deps
Upstream-commit: 04234bd16a463af3b5e093ef180351d7b54b6a35
Component: engine
2016-01-04 14:36:00 -08:00
David Calavera 58e545b6bf Merge pull request #18888 from calavera/event_types
Event all the things!
Upstream-commit: 723be0a3325799fd6b2a6b689af54f5a07edf992
Component: engine
2016-01-04 13:07:33 -08:00
David Calavera c2e5fdc393 Add filter by event type and documentation.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 851fe00c64ffafeb27b12f7b0ed8e41f7720b477
Component: engine
2016-01-04 14:58:04 -05:00
Jess Frazelle 65930d6983 Merge pull request #19002 from jfrazelle/update-test-images
cleanup test images
Upstream-commit: fa57eedff409edb7a4ad926b365213a944a97954
Component: engine
2016-01-04 10:24:30 -08:00
Sebastiaan van Stijn 1162375d21 Merge pull request #15666 from vdemeester/3519-configurable-escape
Implement configurable escape key for attach/exec
Upstream-commit: db738dd77f699e93f976441d5fc11ab48a2d6c68
Component: engine
2016-01-04 00:49:07 +01:00
Vincent Demeester 5582f5eb83 Implement configurable detach key
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration

- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
  commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
  configure the default escape keys for docker client.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 15aa2a663b47b6126a66efefcadb64edfbffb9f5
Component: engine
2016-01-03 23:03:39 +01:00
Vincent Demeester 8a76cb28e3 Merge pull request #18932 from wenchma/same_name_of_container_image
Update integration tests when container and image have same name
Upstream-commit: 1a5b97c76143b7d26006916b23daf8fde73c35ac
Component: engine
2016-01-01 21:40:51 +01:00
Arnaud Porterie 796aa9ca72 Merge pull request #19007 from aboch/npe
Properly initialize IpamConf structure in initBridgeDriver
Upstream-commit: e7c62065742ab59ad546d905c6349892011da9b2
Component: engine
2016-01-01 10:50:54 -08:00
Jessica Frazelle 902a67f4ef add more seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 327421d1df557e156b29d14359a2bfdc59cfb46f
Component: engine
2015-12-30 17:30:44 -08:00
Jessica Frazelle b985b8195a cleanup jess/unshare image
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 626c933730cffb6ca9112271dc4df5a1e462cac1
Component: engine
2015-12-30 16:20:05 -08:00
Alessandro Boch 40fe4ff4d5 Properly initialize IpamConf structure in initBridgeDriver
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: aa97eee1a3cf5c932bdd31535b1e82ca53347ca5
Component: engine
2015-12-30 15:44:50 -08:00
David Calavera e16a7b429c Merge pull request #18999 from tonistiigi/fix-comment-in-inspect
Fix missing comment in docker inspect
Upstream-commit: 102eb03c680b2989efc1548ed1e28686a6aab4bd
Component: engine
2015-12-30 15:07:04 -08:00
David Calavera e32ea4c0f9 Add network events.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f15af1eff75f920c956e7c437d1ef81f5c31129a
Component: engine
2015-12-30 17:39:33 -05:00
David Calavera e54bb2b509 Add volume events.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9d12d093009d3c4bf3bd4ebad3f8327c36d2d584
Component: engine
2015-12-30 17:39:33 -05:00
David Calavera 3580481051 Add event types.
- Stop serializing JSONMessage in favor of events.Message.
- Keep backwards compatibility with JSONMessage for container events.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 72f1881df102fce9ad31e98045b91c204dd44513
Component: engine
2015-12-30 17:39:33 -05:00
Lei Jitang 75ad76df88 Add tests for docker events -f container.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 531ecf59f5bd92b12d4548617ca7bf179c8179a3)
Upstream-commit: 687ef0056204c487aa1a2aeb283e8bda37be74a1
Component: engine
2015-12-30 17:39:32 -05:00
David Calavera 5af0a64a16 Move test out of the windows build.
Because it can still run on windows server and fail because it doesn't
have `chown`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9aad7d209f8919726b40034a40e619f1efa46716
Component: engine
2015-12-30 16:36:48 -05:00
Tonis Tiigi 9cbaaf7f9f Fix missing comment in docker inspect
Fixes #18571

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d32f43013bf4c3aaa90c9ea409fbb9ade4105200
Component: engine
2015-12-30 11:52:53 -08:00
David Calavera cd2f0504b4 Merge pull request #18158 from mauri/add_owner
ADD files to a folder doesn't set correct UID and GID
Upstream-commit: 56f8b051ebc423b188c4a9eb8c151a338a4cb042
Component: engine
2015-12-30 11:19:15 -08:00
David Calavera 440e6d5df7 Merge pull request #18714 from jecarey/16756-docker_cli_pull_test
Use of checkers in docker_cli_pull_test.go
Upstream-commit: 51fa287368205e1f043d632e5930b7cce08a2419
Component: engine
2015-12-30 10:00:41 -08:00
David Calavera eb2413b744 Merge pull request #18952 from coolljt0725/fix_stats_update
Fix docker stats show wrong memory limit when do docker update
Upstream-commit: 708f98f5f9e0a8e957c689a15ca380b8e52f6269
Component: engine
2015-12-30 08:17:42 -08:00
Mauricio Garavaglia cfc051fa3a Fix files ownership when ADD is used
Signed-off-by: Mauricio Garavaglia <mauriciogaravaglia@gmail.com>
Upstream-commit: b638bc6f17f7cef6534b20dd44845e5b066ae2cc
Component: engine
2015-12-30 11:35:19 -03:00
Vincent Demeester 6c53da9054 Merge pull request #18985 from hqhq/hq_handle_dockerCmdInDir
Handle error for dockerCmdInDir
Upstream-commit: c4486e48f2911ad6269c4746fb5a0ae4ea2c5e73
Component: engine
2015-12-30 15:25:20 +01:00
Qiang Huang b167eafbb8 Handle error for dockerCmdInDir
Only two of these are not handled, the one in `TestBuildForceRm`
is intended to not be handled, while the other one in
`TestBuildResourceConstraintsAreUsed` causes problem.

In test case `TestBuildResourceConstraintsAreUsed`, somehow we
are not able to access network to get base image, but the error
message is:

```
Error: failed to inspect container : Unable to read inspect data: json: cannot unmarshal array into Go value of type types.ContainerJSON
```

Totally confusion.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 1b34008532849467623039f78191e0f706fb34a5
Component: engine
2015-12-30 15:21:34 +08:00
Lei Jitang eee4baf0b5 Fix docker stats show wrong memory limit when do docker update
When a container create with -m 100m and then docker update other
cgroup settings such as --cpu-quota, the memory limit show by
docker stats will become the default value but not the 100m.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 518ed75e1ab5b102fffd7fcbf046c127b44c7be7
Component: engine
2015-12-29 20:33:16 -05:00
David Calavera 51b37769f0 Remove usage of pkg sockets and tlsconfig.
- Use the ones provided by docker/go-connections, they are a drop in replacement.
- Remove pkg/sockets from docker.
- Keep pkg/tlsconfig because libnetwork still needs it and there is a
  circular dependency issue.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 8e034802b7ad92a29f08785e553415adcd1348a3
Component: engine
2015-12-29 19:27:12 -05:00