8e7c65a2dd
Merge pull request #19069 from jfrazelle/apparmor-regex-proc
...
fix proc regex
Upstream-commit: 9c9a1d1b4bc2122548a38b233a2f26ab5304de4c
Component: engine
2016-01-11 13:50:25 -08:00
46b5818462
Merge pull request #18785 from aaronlehmann/new-manifest
...
New image manifest format
Upstream-commit: f11b6a2ab313a03d051dd6f69d264d0482df72d6
Component: engine
2016-01-11 12:01:46 -08:00
bc47f91463
Merge pull request #16032 from cpuguy83/remove_sqlite_dep
...
Build names and links at runtime - no more sqlite
Upstream-commit: 9a23569ecf48e07b6c6e7c1d734b54c7ce4c666a
Component: engine
2016-01-11 10:59:49 -08:00
ddd50b3705
Merge pull request #18512 from euank/18510-fixOomKilled
...
Set OOMKilled state on any OOM event
Upstream-commit: 967acd56c175b7c0f3ad4236c664730338a94bb8
Component: engine
2016-01-11 00:09:26 +01:00
c1c124e078
Merge pull request #19193 from Microsoft/jjh/networkapitests
...
Windows CI: Turn off network API tests
Upstream-commit: 6175add0e16d275511162f521dafdda7ba8f560c
Component: engine
2016-01-10 21:18:21 +01:00
7e1d4c2453
Merge pull request #19195 from Microsoft/jjh/wincifailingtests
...
Windows CI: Deal with failing tests for TP4
Upstream-commit: 38f4217bfff1e5aec7457c2acfbe2409759ee830
Component: engine
2016-01-10 21:18:02 +01:00
26f279a5f0
Merge pull request #19205 from runcom/fix-formats
...
integration-cli: fix wrong formats
Upstream-commit: 7b1caafe27c06aae3311f00a9bdee021c3be8b63
Component: engine
2016-01-10 20:53:11 +01:00
a18ec5adb2
integration-cli: fix wrong formats
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5fe38d39e7c7085e53904d6403e8b48274f86e8b
Component: engine
2016-01-09 11:44:15 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
