e44364eae9
Merge pull request #18587 from calavera/daemon_configuration_file
...
Allow to set daemon and server configurations in a file.
2016-01-14 16:44:58 -08:00
94b2d56690
Merge pull request #19109 from BrianBland/crossRepositoryPush
...
Cross repository push
2016-01-14 18:50:53 -05:00
6309947718
Changes cross-repository blob mounting to a blob Create option
...
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-14 14:26:03 -08:00
677a6b3506
Allow to set daemon and server configurations in a file.
...
Read configuration after flags making this the priority:
1- Apply configuration from file.
2- Apply configuration from flags.
Reload configuration when a signal is received, USR2 in Linux:
- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 16:44:37 -05:00
e35f5a481a
Merge pull request #17316 from rmb938/ipam_conf_options
...
Add IPAM Config Options to match libnetwork
2016-01-14 16:30:03 -05:00
d3392a3bde
Windows: Fix test regression from 19155
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 12:00:27 -08:00
662cac08ef
Add IPAM Config Options to match libnetwork
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-14 14:32:25 -05:00
7cd6210a88
Merge pull request #19326 from HackToday/19153-filter-rethink
...
Fix image filter
2016-01-14 13:59:14 -05:00
73a5393bf3
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
2016-01-14 10:58:51 -08:00
812d95cdfb
Merge pull request #19323 from wenchma/19089-add_network_id
...
Add network ID to container inspect
2016-01-14 09:58:24 -08:00
a225e39667
Merge pull request #19155 from coolljt0725/create_cwd_on_create
...
Create the working directory on container creation
2016-01-14 09:13:44 -08:00
dda513ef65
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 08:44:41 -08:00
349d9700bd
Merge pull request #19291 from coolljt0725/fix_19100
...
Fix #19100 and fix a typo
2016-01-14 11:40:29 -05:00
9f676ade0a
Add network ID to container inspect
...
Fixes issue #19089
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-14 22:33:41 +08:00
5ee69eb470
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>
2016-01-14 08:17:40 +00:00
3d2539d39d
Fix #19100 and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-14 14:58:54 +08:00
b464f1d78c
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>
2016-01-13 21:28:52 -08:00
db1d5f7ea3
Add test to verify that response hijacking always works over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-13 20:18:06 -05:00
7289c7218e
Adds cross-repository blob pushing behavior
...
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-13 14:26:30 -08:00
612cf0f172
Merge pull request #19279 from tiborvass/rename-authz-to-authorization
...
Rename authz to authorization for greater clarity
2016-01-13 14:30:18 -05:00
5c630ea7c3
Rename authz to authorization for greater clarity
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-13 14:15:37 -05:00
11a95b9514
integration-cli: check nil before Close'ing
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-13 13:36:45 +01:00
a79f96828f
Merge pull request #19249 from calavera/carry_17414
...
[Carry 17414] Added additional container information to "docker info".
2016-01-13 10:42:22 +01:00
47d87d3b92
Merge pull request #19229 from mavenugo/udlinks
...
Local alias support
2016-01-12 16:47:32 -08:00
1e1a3c9508
Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id
...
Fix rmi by ID untagging image on error
2016-01-12 18:56:25 -05:00
c0c66c57b2
Merge pull request #19170 from aaronlehmann/delete-prune-digests
...
Prune digest references when deleting by tag
2016-01-12 15:15:36 -08:00
38a45eed88
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>
2016-01-12 13:45:40 -08:00
e221b8a3d6
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>
2016-01-12 13:38:48 -08:00
2f048f73e1
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>
2016-01-12 12:11:43 -08:00
293b3767c8
Merge pull request #19245 from jfrazelle/seccomp-kernel-check
...
check seccomp is configured in the kernel
2016-01-12 11:33:27 -08:00
40d5ced9d0
check seccomp is configured in the kernel
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-12 09:45:21 -08:00
c72be040bb
Merge pull request #19187 from estesp/lets-do-this
...
User namespaces: graduate from experimental
2016-01-12 09:34:19 -08:00
301627c677
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
2016-01-12 07:06:31 -08:00
79d4f0f56e
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-11 20:13:39 -05:00
e732f4e649
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)
2016-01-11 19:14:44 -05:00
9c9a1d1b4b
Merge pull request #19069 from jfrazelle/apparmor-regex-proc
...
fix proc regex
2016-01-11 13:50:25 -08:00
f11b6a2ab3
Merge pull request #18785 from aaronlehmann/new-manifest
...
New image manifest format
2016-01-11 12:01:46 -08:00
9a23569ecf
Merge pull request #16032 from cpuguy83/remove_sqlite_dep
...
Build names and links at runtime - no more sqlite
2016-01-11 10:59:49 -08:00
967acd56c1
Merge pull request #18512 from euank/18510-fixOomKilled
...
Set OOMKilled state on any OOM event
2016-01-11 00:09:26 +01:00
6175add0e1
Merge pull request #19193 from Microsoft/jjh/networkapitests
...
Windows CI: Turn off network API tests
2016-01-10 21:18:21 +01:00
38f4217bff
Merge pull request #19195 from Microsoft/jjh/wincifailingtests
...
Windows CI: Deal with failing tests for TP4
2016-01-10 21:18:02 +01:00
7b1caafe27
Merge pull request #19205 from runcom/fix-formats
...
integration-cli: fix wrong formats
2016-01-10 20:53:11 +01:00
5fe38d39e7
integration-cli: fix wrong formats
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-09 11:44:15 +01:00
ad6c1b7649
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>
2016-01-08 17:27:31 -08:00
1fa2e31151
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>
2016-01-08 17:27:31 -08:00
ba19b6927f
Increase integration cli test memory
...
Signed-off-by: Euan <euank@amazon.com>
2016-01-08 23:10:31 +00:00
64a6dc3558
Docker changes for libnetwork vendoring..
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-08 14:13:55 -08:00
807d575b5e
Merge pull request #19135 from Microsoft/jjh/securitywarning
...
Windows: Fix security warning regression
2016-01-08 13:55:41 -08:00
25c383391a
Windows CI: Deal with failing tests for TP4
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-08 13:49:43 -08:00
4c380010a6
Windows CI: Turn off network API tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-08 12:58:54 -08:00
Sebastiaan van Stijn
Tibor Vass
Brian Bland
David Calavera
John Howard
Ryan Belgrave
Brian Goff
Madhu Venugopal
Wen Cheng Ma
Kai Qiang Wu(Kennan)
Lei Jitang
Tibor Vass
Antonio Murdaca
Antonio Murdaca
Tonis Tiigi
Aaron Lehmann
Jess Frazelle
Jessica Frazelle
Kim Eik
Arnaud Porterie
Alexander Morozov
Vincent Demeester
Euan
Santhosh Manohar