p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c992d819e30a60ca6a058ef5433af4bf2aab9cb9
docker-cli/components/engine/daemon
History
Sebastiaan van Stijn c992d819e3 Fix: network=host using wrong resolv.conf with systemd-resolved 
When running a container in the host's network namespace, the container
gets a copy of the host's resolv.conf (copied to `/etc/resolv.conf` inside
the container).

The current code always used the default (`/etc/resolv.conf`) path on the
host, irregardless if `systemd-resolved` was used or not.

This patch uses the correct file if `systemd-resolved` was detected
to be running.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8364d1c9d590d4266871cd820b76ef12e2b934ed)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 04ae160eca4a8bc134ca9abafa044191b893080b
Component: engine
2019-03-26 12:55:53 +01:00
..
caps
lcow: Allow the client to add or remove capabilities
2018-06-15 16:03:33 -07:00
cluster
set bigger grpc limit for GetConfigs api
2019-02-27 19:01:12 +01:00
config
builder: use buildkit's GC for build cache
2018-09-21 17:06:25 -07:00
discovery
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
events
Add canonical import comment
2018-02-05 16:51:57 -05:00
exec
Fix race condition between exec start and resize
2018-06-08 11:07:48 +08:00
graphdriver
Graphdriver: fix "device" mode not being detected if "character-device" bit is set
2019-02-20 14:31:18 +01:00
images
daemon/images: removed "found leaked image layer" warning, because it is expected now with buildkit
2018-09-21 17:06:25 -07:00
initlayer
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
links
Add canonical import comment
2018-02-05 16:51:57 -05:00
listeners
Adapt listeners to upstream API changes in go-systemd
2018-05-23 21:57:30 +02:00
logger
awslogs: account for UTF-8 normalization in limits
2018-11-08 15:26:01 +01:00
names
Add canonical import comment
2018-02-05 16:51:57 -05:00
network
Block task starting until node attachments are ready
2018-08-20 15:28:15 -05:00
stats
Fix stats collector spinning CPU if no stats are collected
2018-03-15 17:56:15 +01:00
testdata
Remove libtrust dep from api
2017-09-06 12:05:19 -04:00
apparmor_default_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
apparmor_default.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
archive_tarcopyoptions_unix.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
archive_tarcopyoptions_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
archive_tarcopyoptions.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
archive_unix.go
Move mount parsing to separate package.
2018-04-19 06:35:54 -04:00
archive_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
archive.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
attach.go
daemon.ContainerLogs(): fix resource leak on follow
2018-09-06 18:39:22 -07:00
auth.go
Switch from x/net/context -> context
2018-04-23 13:52:44 -07:00
bindmount_unix.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
changes.go
c.RWLayer: check for nil before use
2018-02-09 11:24:09 -08:00
checkpoint.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
cluster.go
Move network conversions out of API router
2018-06-27 17:11:29 -07:00
commit.go
Move all daemon image methods into imageService
2018-02-26 16:48:29 -05:00
configs_linux.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
configs_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
configs_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
configs.go
Merge configs/secrets in unix implementation
2018-02-16 11:25:14 -05:00
container_linux.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
container_operations_unix.go
Fix: network=host using wrong resolv.conf with systemd-resolved
2019-03-26 12:55:53 +01:00
container_operations_windows.go
Fixes for resolv.conf
2018-07-26 11:17:56 -07:00
container_operations.go
Fixes for resolv.conf
2018-07-26 11:17:56 -07:00
container_unix_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
container_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
container.go
Move mount parsing to separate package.
2018-04-19 06:35:54 -04:00
create_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
create_unix.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
create_windows.go
Extract volume interaction to a volumes service
2018-05-25 14:21:07 -04:00
create.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
daemon_linux_test.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
daemon_linux.go
Fixes for resolv.conf
2018-07-26 11:17:56 -07:00
daemon_test.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
daemon_unix_test.go
Remove old/uneeded volume migration from vers 1.7
2018-04-17 14:06:53 -04:00
daemon_unix.go
use empty string as cgroup path to grab first find
2018-12-07 18:58:03 +01:00
daemon_unsupported.go
Fixes for resolv.conf
2018-07-26 11:17:56 -07:00
daemon_windows_test.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
daemon_windows.go
keep old network ids
2019-02-11 22:12:52 +01:00
daemon.go
add support of registry-mirrors and insecure-registries to buildkit
2018-09-21 17:06:25 -07:00
debugtrap_unix.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
debugtrap_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
debugtrap_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
delete_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
delete.go
Extract volume interaction to a volumes service
2018-05-25 14:21:07 -04:00
dependency.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
disk_usage.go
Extract volume interaction to a volumes service
2018-05-25 14:21:07 -04:00
errors.go
Extract volume interaction to a volumes service
2018-05-25 14:21:07 -04:00
events_test.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
events.go
Image events
2018-02-21 18:26:16 -05:00
exec_linux_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
exec_linux.go
Fix AppArmor not being applied to Exec processes
2018-03-02 14:05:36 +01:00
exec_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
exec.go
Fix race condition between exec start and resize
2018-06-08 11:07:48 +08:00
export.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
health_test.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
health.go
Switch from x/net/context -> context
2018-04-23 13:52:44 -07:00
info_test.go
Masking credentials from proxy URL
2018-10-04 21:20:54 +02:00
info_unix_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
info_unix.go
Remove version-checks for containerd and runc
2018-10-05 12:35:59 +02:00
info_windows.go
Add "Warnings" to /info endpoint, and move detection to the daemon
2018-08-21 11:36:15 +02:00
info.go
Deprecate legacy overlay storage driver, and add warning
2018-10-12 02:26:17 +02:00
inspect_linux.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
inspect_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
inspect_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
inspect.go
Extract volume interaction to a volumes service
2018-05-25 14:21:07 -04:00
keys_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
keys.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
kill.go
daemon/*.go: fix some Wrap[f]/Warn[f] errors
2018-07-11 15:51:51 +02:00
licensing_test.go
Expose license status in Info (#37612)
2018-08-17 17:05:21 -07:00
licensing.go
Expose license status in Info (#37612)
2018-08-17 17:05:21 -07:00
links.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
list_test.go
Fix regression when filtering container names using a leading slash
2018-08-29 12:54:06 +02:00
list_unix.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
list_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
list.go
Fix regression when filtering container names using a leading slash
2018-08-29 12:54:06 +02:00
logdrivers_linux.go
Add new local log driver
2018-08-17 09:36:56 -07:00
logdrivers_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
logs_test.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
logs.go
daemon.ContainerLogs(): fix resource leak on follow
2018-09-06 18:39:22 -07:00
metrics_unix.go
Move plugin client creation to the extension point
2018-05-25 15:18:53 -04:00
metrics_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
metrics.go
Move plugin client to separate interface
2018-05-30 15:22:10 -04:00
monitor.go
daemon/*.go: fix some Wrap[f]/Warn[f] errors
2018-07-11 15:51:51 +02:00
mounts.go
Extract volume interaction to a volumes service
2018-05-25 14:21:07 -04:00
names.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
network.go
builder: setup code for a bridge networking
2018-08-20 18:55:01 +00:00
oci_linux_test.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
oci_linux.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
oci_windows.go
lcow: Allow the client to add device cgroup rules
2018-06-15 16:14:17 -07:00
oci.go
lcow: Allow the client to add device cgroup rules
2018-06-15 16:14:17 -07:00
pause.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
prune.go
Move network conversions out of API router
2018-06-27 17:11:29 -07:00
reload_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
reload_unix.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
reload_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
reload.go
allow features option live reloadable
2018-09-04 15:01:46 +00:00
rename.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
resize_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
resize.go
Fix race condition between exec start and resize
2018-06-08 11:07:48 +08:00
restart.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
seccomp_disabled.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
seccomp_linux.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
seccomp_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
secrets_linux.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
secrets_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
secrets_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
secrets.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
selinux_linux.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
selinux_unsupported.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
start_unix.go
vendor: update containerd to 63522d9
2018-06-08 19:19:06 -07:00
start_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
start.go
Delete stale containerd object on start failure
2019-02-15 01:01:52 +01:00
stats_collector.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
stats_unix.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
stats_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
stats.go
Switch from x/net/context -> context
2018-04-23 13:52:44 -07:00
stop.go
daemon.ContainerStop(): fix for a negative timeout
2018-05-03 10:04:33 -07:00
top_unix_test.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
top_unix.go
ContainerTop: improve error message
2018-05-24 18:24:36 -07:00
top_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
trustkey_test.go
Update tests to use gotest.tools 👼
2018-06-13 09:04:30 +02:00
trustkey.go
Loosen permissions on /etc/docker directory
2018-09-18 12:34:56 +02:00
unpause.go
daemon/*.go: fix some Wrap[f]/Warn[f] errors
2018-07-11 15:51:51 +02:00
update_linux.go
Various code-cleanup
2018-05-23 17:50:54 +02:00
update_windows.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
update.go
Add canonical import comment
2018-02-05 16:51:57 -05:00
util_test.go
Fix race condition between exec start and resize
2018-06-08 11:07:48 +08:00
volumes_linux_test.go
Use rslave propagation for mounts from daemon root
2018-02-07 14:27:09 -05:00
volumes_linux.go
Fix the several typos detected by github.com/client9/misspell
2018-08-09 00:45:00 +09:00
volumes_unit_test.go
Move mount parsing to separate package.
2018-04-19 06:35:54 -04:00
volumes_unix_test.go
Move mount parsing to separate package.
2018-04-19 06:35:54 -04:00
volumes_unix.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
volumes_windows.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00
volumes.go
Fix relabeling local volume source dir
2018-08-30 17:34:59 -07:00
wait.go
Switch from x/net/context -> context
2018-04-23 13:52:44 -07:00
workdir.go
Add ADD/COPY --chown flag support to Windows
2018-08-13 21:59:11 -07:00