57bedb0b2d
Merge pull request #17316 from rmb938/ipam_conf_options
...
Add IPAM Config Options to match libnetwork
Upstream-commit: e35f5a481ac5c982c4f97be5dc41206e21e19007
Component: engine
2016-01-14 16:30:03 -05:00
a939b26632
Windows: Fix test regression from 19155
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d3392a3bdecca4b79e1ea942595f05c03fcd5995
Component: engine
2016-01-14 12:00:27 -08:00
f8714c52f0
Add IPAM Config Options to match libnetwork
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com >
Upstream-commit: 662cac08ef83ee105addb4d29f6e46188468306f
Component: engine
2016-01-14 14:32:25 -05:00
f2aa94a27b
Merge pull request #19326 from HackToday/19153-filter-rethink
...
Fix image filter
Upstream-commit: 7cd6210a88006da21529aeccadea79c9ce720abb
Component: engine
2016-01-14 13:59:14 -05:00
082c746378
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
2016-01-14 10:58:51 -08:00
ded6ab4c78
Merge pull request #19323 from wenchma/19089-add_network_id
...
Add network ID to container inspect
Upstream-commit: 812d95cdfb78f4063b967b23911ed3ef152ad533
Component: engine
2016-01-14 09:58:24 -08:00
980beea08a
Merge pull request #19155 from coolljt0725/create_cwd_on_create
...
Create the working directory on container creation
Upstream-commit: a225e39667d7ddd2345326bc5cd3b1ce15fd0bad
Component: engine
2016-01-14 09:13:44 -08:00
8eb1087397
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
2016-01-14 08:44:41 -08:00
cfd7c2432a
Merge pull request #19291 from coolljt0725/fix_19100
...
Fix #19100 and fix a typo
Upstream-commit: 349d9700bd5e3bbf86ea2b7c0097b5f897e2fbc1
Component: engine
2016-01-14 11:40:29 -05:00
806650627f
Add network ID to container inspect
...
Fixes issue #19089
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 9f676ade0aef66bb66a26171d6bfb27f105fa1df
Component: engine
2016-01-14 22:33:41 +08:00
84e80bd254
Fix image filter
...
This is related image fix for Propose #19153
for volume related change, would use another patch
to fix that.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 5ee69eb470316eead3af20725de54d3c47a47a62
Component: engine
2016-01-14 08:17:40 +00:00
e5509a078a
Fix #19100 and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3d2539d39d6dd12bf3db13f4df21a997d4f7ee3b
Component: engine
2016-01-14 14:58:54 +08:00
2b7ea75ef2
Forced endpoint cleanup
...
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: b464f1d78cdfa2a4124e083b8f7b0f2353f12de3
Component: engine
2016-01-13 21:28:52 -08:00
7237c4ead6
Add test to verify that response hijacking always works over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: db1d5f7ea37c2a3b0bedc9dbcbf5bd3b32258219
Component: engine
2016-01-13 20:18:06 -05:00
3bf5cbf342
Merge pull request #19279 from tiborvass/rename-authz-to-authorization
...
Rename authz to authorization for greater clarity
Upstream-commit: 612cf0f172948c892d642af3213a012fcf292135
Component: engine
2016-01-13 14:30:18 -05:00
460be1e8dd
Rename authz to authorization for greater clarity
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5c630ea7c3d5e7a24e1c4b2e15506f326706e9bc
Component: engine
2016-01-13 14:15:37 -05:00
c1149a155a
integration-cli: check nil before Close'ing
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 11a95b951435b63accae8765f7ace97c73f133d0
Component: engine
2016-01-13 13:36:45 +01:00
69c1610f93
Merge pull request #19249 from calavera/carry_17414
...
[Carry 17414] Added additional container information to "docker info".
Upstream-commit: a79f96828f7da2fc762002bf79ab8a9dcf908457
Component: engine
2016-01-13 10:42:22 +01:00
b2c9225704
Merge pull request #19229 from mavenugo/udlinks
...
Local alias support
Upstream-commit: 47d87d3b92e349608e080f15035d8485af7254c5
Component: engine
2016-01-12 16:47:32 -08:00
e1237c9947
Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id
...
Fix rmi by ID untagging image on error
Upstream-commit: 1e1a3c9508f196f17daec3e47298a86949ab66ec
Component: engine
2016-01-12 18:56:25 -05:00
296e59632a
Merge pull request #19170 from aaronlehmann/delete-prune-digests
...
Prune digest references when deleting by tag
Upstream-commit: c0c66c57b2d898e43f7dd74ad9f2f256ea5dfcdf
Component: engine
2016-01-12 15:15:36 -08:00
f00ac953d1
Fix rmi by ID untagging image on error
...
Do not untag image if it would later get a hard conflict because of running containers.
Fixes #18873
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 38a45eed8850a15d2f737ce7455f29c5ae53ab49
Component: engine
2016-01-12 13:45:40 -08:00
6c7b14647b
Support --link for user-defined networks
...
This brings in the container-local alias functionality for containers
connected to u ser-defined networks.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: e221b8a3d64c13178e156fc3ece5e9894dac1603
Component: engine
2016-01-12 13:38:48 -08:00
eb73b224c4
Prune digest references when deleting by tag
...
When pulling an image with content trust enabled, two references are
created: a digest reference and a tag reference. Deleting by tag
wouldn't actually remove the image, because the digest reference keeps
it alive.
This change modifies the rmi logic so that digest references don't keep
an image alive. If the last tag referencing a given image is deleted,
any digest references to it will be removed as well, so the image can
actually get deleted. This fixes the usability problem with deletions
when content trust is in use, so something like "docker pull busybox;
docker rmi busybox" will work as expected.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2f048f73e122ab90b8f35a088b4be52bd255caad
Component: engine
2016-01-12 12:11:43 -08:00
ebf645cab0
Merge pull request #19245 from jfrazelle/seccomp-kernel-check
...
check seccomp is configured in the kernel
Upstream-commit: 293b3767c8453ee7ccabe53c357965241d7afbf6
Component: engine
2016-01-12 11:33:27 -08:00
cb5c9d856b
check seccomp is configured in the kernel
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 40d5ced9d00113744555ff13f4e62617dda5f1e2
Component: engine
2016-01-12 09:45:21 -08:00
4a64d99bbc
Merge pull request #19187 from estesp/lets-do-this
...
User namespaces: graduate from experimental
Upstream-commit: c72be040bb893e49bb12baf7e688c88b635d8ea1
Component: engine
2016-01-12 09:34:19 -08:00
e2b2a71502
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
2016-01-12 07:06:31 -08:00
3b26d1d1d4
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 79d4f0f56ec84922184e25c0263807158b6fb76b
Component: engine
2016-01-11 20:13:39 -05:00
aa00140122
Added additional container information to "docker info".
...
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.
Signed-off-by: Kim Eik <kim@heldig.org >
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
Upstream-commit: e732f4e649a3420eab3b6541dacbefe3cf00719a
Component: engine
2016-01-11 19:14:44 -05:00
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
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
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
