p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b520646fdd2c96fcad25b007ffaa094e813548e6
docker-cli/components/engine/daemon
History
Yong Tang b520646fdd The option --add-host and --net=host should not be mutually exclusive. 
This fix tries to address the issue raised in #21976 and allows
the options of `--add-host` and `--net=host` to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90bd41a74d57080711678bffa2bc4371020ee3a5
Component: engine
2016-05-24 18:49:11 -07:00
..
caps
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
events
Add filter for events emitted by docker daemon
2016-05-23 19:00:47 -07:00
exec
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
graphdriver
Merge pull request #22948 from dmcgowan/remove-unused-overlay-mounted
2016-05-24 13:08:06 -07:00
links
Replace usage of pkg/nat with go-connections/nat.
2015-12-22 13:31:46 -05:00
logger
Remove deprecated driver specific log tags
2016-05-10 07:43:44 -07:00
network
Add "driver" filter for network ls
2016-04-29 16:22:26 +02:00
apparmor_default_unsupported.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
apparmor_default.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
archive_unix.go
Windows: docker cp consistent paths
2016-05-06 16:08:53 -07:00
archive_windows.go
Windows: Remove TP4 support from main code
2016-04-06 12:12:20 -07:00
archive.go
Windows: docker cp consistent paths
2016-05-06 16:08:53 -07:00
attach.go
Let client print error when speicify wrong detach keys
2016-04-04 15:35:55 +08:00
changes.go
…
commit.go
Remove reference package dependency from the api.
2016-04-07 15:01:23 -07:00
config_experimental.go
Move userns support out of experimental into master
2016-01-08 15:06:22 -05:00
config_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
config_stub.go
…
config_test.go
add validating configs from configuration file
2016-03-16 00:05:52 +08:00
config_unix.go
Fix some mistakes in dockerd.md
2016-05-19 20:41:37 +08:00
config_windows.go
Windows: bridgeConfig rework
2016-03-28 12:24:01 -07:00
config.go
Fix some mistakes in dockerd.md
2016-05-19 20:41:37 +08:00
container_operations_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
container_operations_unix.go
Add support for --pid=container:<id>
2016-05-17 13:49:05 -04:00
container_operations_windows.go
Merge pull request #21809 from Microsoft/jjh/tp4removal
2016-04-06 14:11:33 -07:00
container_operations.go
The option --add-host and --net=host should not be mutually exclusive.
2016-05-24 18:49:11 -07:00
create_unix.go
Merge pull request #21270 from ehazlett/resource-labels
2016-03-22 15:12:33 -04:00
create_windows.go
Windows: Remove TP4 support from main code
2016-04-06 12:12:20 -07:00
create.go
Fix building image error if bridge network is disabled
2016-05-24 16:20:26 +08:00
daemon_experimental.go
Move userns support out of experimental into master
2016-01-08 15:06:22 -05:00
daemon_linux_test.go
Fix container mount cleanup issues
2016-03-30 17:25:49 -07:00
daemon_linux.go
Fix container mount cleanup issues
2016-03-30 17:25:49 -07:00
daemon_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
daemon_stub.go
Move userns support out of experimental into master
2016-01-08 15:06:22 -05:00
daemon_test.go
Wait for discovery on container start error
2016-05-11 09:49:51 -04:00
daemon_unix_test.go
Consolidate security options to use = as separator.
2016-03-17 13:34:42 -04:00
daemon_unix.go
Suppress "IPv4 forwarding" warning for --net=none
2016-05-20 17:57:29 +02:00
daemon_unsupported.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
daemon_windows.go
Merge pull request #22774 from Microsoft/jjh/client
2016-05-23 11:29:50 -07:00
daemon.go
Merge pull request #22091 from amitkris/build_solaris
2016-05-24 21:41:36 +02:00
debugtrap_unix.go
…
debugtrap_unsupported.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
debugtrap_windows.go
Windows: psignal alias not required
2016-03-27 17:23:34 -07:00
delete_test.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
delete.go
Merge pull request #21802 from tiborvass/carry-21716
2016-04-06 15:21:38 -04:00
discovery_test.go
Fix minor vet warnings
2016-02-03 10:43:01 -08:00
discovery.go
Wait for discovery on container start error
2016-05-11 09:49:51 -04:00
errors.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
events_test.go
Add the possibility to log event with specific attributes
2016-01-17 12:14:01 +01:00
events.go
Add filter for events emitted by docker daemon
2016-05-23 19:00:47 -07:00
exec_linux.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
exec_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
exec_windows.go
Windows: escape entrypoint before passing to libcontainerd
2016-03-30 12:59:50 -07:00
exec.go
Update client code with api changes
2016-04-15 12:48:01 +02:00
export.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
image_delete.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
image_exporter.go
Move some image related methods & struct to smaller files
2016-05-21 22:36:11 +02:00
image_history.go
Move some image related methods & struct to smaller files
2016-05-21 22:36:11 +02:00
image_inspect.go
Move some image related methods & struct to smaller files
2016-05-21 22:36:11 +02:00
image_pull.go
Remove reference package dependency from the api.
2016-04-07 15:01:23 -07:00
image_push.go
Remove reference package dependency from the api.
2016-04-07 15:01:23 -07:00
image_tag.go
Remove reference package dependency from the api.
2016-04-07 15:01:23 -07:00
image.go
Move some image related methods & struct to smaller files
2016-05-21 22:36:11 +02:00
images.go
Fix image filter
2016-01-14 08:17:40 +00:00
import.go
Remove reference package dependency from the api.
2016-04-07 15:01:23 -07:00
info.go
handle error when getting hostname in info api
2016-05-07 08:51:52 +08:00
inspect_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
inspect_unix.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
inspect_windows.go
Windows libcontainerd implementation
2016-03-18 13:38:41 -07:00
inspect.go
Docker inspect gave default log options even when the option is emtpy.
2016-05-02 21:14:42 -07:00
kill.go
Fix critical bug: can't restart a restarting container
2016-04-08 22:02:30 +08:00
links_test.go
Extract container store from the daemon.
2016-01-19 13:21:41 -05:00
links.go
Add migration from sqlite links back to hostConfig
2016-01-11 11:31:29 -05:00
list_unix.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
list_windows.go
…
list.go
Merge pull request #21947 from boynux/fix-filter-exited
2016-05-04 15:21:59 +02:00
logdrivers_linux.go
daemon/logger: Add logging driver for Google Cloud Logging
2016-03-01 08:06:10 -08:00
logdrivers_windows.go
Windows: Add ETW logging driver plug-in
2016-02-16 13:24:49 -08:00
logs.go
Add support for reading logs extra attrs
2016-05-06 20:42:20 -04:00
monitor_linux.go
Adding postRunProcessing infrastructure for hanlding Windows Update.
2016-04-06 14:03:05 -07:00
monitor_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
monitor_windows.go
Adding servicing update to postRunProcessing for Windows containers.
2016-04-25 12:16:26 -07:00
monitor.go
Fixing Windows update logic.
2016-05-12 17:45:53 -07:00
mounts.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
network.go
Docker changes for libnetwork vendoring b66c038
2016-05-16 15:04:01 -07:00
oci_linux.go
Add support for --pid=container:<id>
2016-05-17 13:49:05 -04:00
oci_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
oci_windows.go
Add IO Resource Controls for Windows
2016-04-25 13:07:29 -07:00
pause.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
rename.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
resize.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
restart.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
seccomp_disabled.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
seccomp_linux.go
Align default seccomp profile with selected capabilities
2016-05-11 09:30:23 +01:00
selinux_linux.go
…
selinux_unsupported.go
…
start.go
inherit the daemon log options when creating containers
2016-05-02 23:04:04 +08:00
stats_collector_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
stats_collector_unix.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
stats_collector_windows.go
…
stats.go
Update code for latest engine-api
2016-04-19 16:56:54 +02:00
stop.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
top_unix.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
top_windows.go
Windows: Minimal docker top implementation
2016-03-20 16:45:53 -07:00
unpause.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
update_linux.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
update_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
update_windows.go
Windows libcontainerd implementation
2016-03-18 13:38:41 -07:00
update.go
Remove WaitRunning
2016-04-27 11:36:47 +08:00
volumes_unit_test.go
…
volumes_unix.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
volumes_windows.go
Remove unneeded references to execDriver
2016-03-21 13:06:08 -07:00
volumes.go
Fix N+1 calling Path() on volume ls
2016-04-12 20:30:34 -04:00
wait.go
…