mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
427c7cc5f8
This allows configuring the daemon's proxy server through the daemon.json con-
figuration file or command-line flags configuration file, in addition to the
existing option (through environment variables).
Configuring environment variables on Windows to configure a service is more
complicated than on Linux, and adding alternatives for this to the daemon con-
figuration makes the configuration more transparent and easier to use.
The configuration as set through command-line flags or through the daemon.json
configuration file takes precedence over env-vars in the daemon's environment,
which allows the daemon to use a different proxy. If both command-line flags
and a daemon.json configuration option is set, an error is produced when starting
the daemon.
Note that this configuration is not "live reloadable" due to Golang's use of
`sync.Once()` for proxy configuration, which means that changing the proxy
configuration requires a restart of the daemon (reload / SIGHUP will not update
the configuration.
With this patch:
cat /etc/docker/daemon.json
{
"http-proxy": "http://proxytest.example.com:80",
"https-proxy": "https://proxytest.example.com:443"
}
docker pull busybox
Using default tag: latest
Error response from daemon: Get "https://registry-1.docker.io/v2/": proxyconnect tcp: dial tcp: lookup proxytest.example.com on 127.0.0.11:53: no such host
docker build .
Sending build context to Docker daemon 89.28MB
Step 1/3 : FROM golang:1.16-alpine AS base
Get "https://registry-1.docker.io/v2/": proxyconnect tcp: dial tcp: lookup proxytest.example.com on 127.0.0.11:53: no such host
Integration tests were added to test the behavior:
- verify that the configuration through all means are used (env-var,
command-line flags, damon.json), and used in the expected order of
preference.
- verify that conflicting options produce an error.
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
||
|---|---|---|
| .. | ||
| cluster | ||
| config | ||
| discovery | ||
| events | ||
| exec | ||
| graphdriver | ||
| images | ||
| initlayer | ||
| links | ||
| listeners | ||
| logger | ||
| names | ||
| network | ||
| stats | ||
| testdata | ||
| apparmor_default.go | ||
| apparmor_default_unsupported.go | ||
| archive.go | ||
| archive_tarcopyoptions.go | ||
| archive_tarcopyoptions_unix.go | ||
| archive_tarcopyoptions_windows.go | ||
| archive_unix.go | ||
| archive_windows.go | ||
| attach.go | ||
| auth.go | ||
| changes.go | ||
| checkpoint.go | ||
| cluster.go | ||
| commit.go | ||
| configs.go | ||
| configs_linux.go | ||
| configs_unsupported.go | ||
| configs_windows.go | ||
| container.go | ||
| container_linux.go | ||
| container_operations.go | ||
| container_operations_unix.go | ||
| container_operations_windows.go | ||
| container_unix_test.go | ||
| container_windows.go | ||
| content.go | ||
| create.go | ||
| create_test.go | ||
| create_unix.go | ||
| create_windows.go | ||
| daemon.go | ||
| daemon_linux.go | ||
| daemon_linux_test.go | ||
| daemon_test.go | ||
| daemon_unix.go | ||
| daemon_unix_test.go | ||
| daemon_unsupported.go | ||
| daemon_windows.go | ||
| daemon_windows_test.go | ||
| debugtrap_unix.go | ||
| debugtrap_unsupported.go | ||
| debugtrap_windows.go | ||
| delete.go | ||
| delete_test.go | ||
| dependency.go | ||
| devices_linux.go | ||
| disk_usage.go | ||
| errors.go | ||
| events.go | ||
| events_test.go | ||
| exec.go | ||
| exec_linux.go | ||
| exec_linux_test.go | ||
| exec_windows.go | ||
| export.go | ||
| health.go | ||
| health_test.go | ||
| info.go | ||
| info_unix.go | ||
| info_unix_test.go | ||
| info_windows.go | ||
| inspect.go | ||
| inspect_linux.go | ||
| inspect_test.go | ||
| inspect_windows.go | ||
| keys.go | ||
| keys_unsupported.go | ||
| kill.go | ||
| licensing.go | ||
| licensing_test.go | ||
| links.go | ||
| list.go | ||
| list_test.go | ||
| list_unix.go | ||
| list_windows.go | ||
| logdrivers_linux.go | ||
| logdrivers_windows.go | ||
| logs.go | ||
| logs_test.go | ||
| metrics.go | ||
| metrics_unix.go | ||
| metrics_unsupported.go | ||
| monitor.go | ||
| mounts.go | ||
| names.go | ||
| network.go | ||
| network_windows.go | ||
| nvidia_linux.go | ||
| oci_linux.go | ||
| oci_linux_test.go | ||
| oci_utils.go | ||
| oci_windows.go | ||
| oci_windows_test.go | ||
| pause.go | ||
| prune.go | ||
| reload.go | ||
| reload_test.go | ||
| reload_unix.go | ||
| reload_windows.go | ||
| rename.go | ||
| resize.go | ||
| resize_test.go | ||
| restart.go | ||
| runtime_unix.go | ||
| runtime_windows.go | ||
| seccomp_disabled.go | ||
| seccomp_linux.go | ||
| seccomp_linux_test.go | ||
| seccomp_unsupported.go | ||
| secrets.go | ||
| secrets_linux.go | ||
| secrets_unsupported.go | ||
| secrets_windows.go | ||
| start.go | ||
| start_unix.go | ||
| start_windows.go | ||
| stats.go | ||
| stats_collector.go | ||
| stats_unix.go | ||
| stats_windows.go | ||
| stop.go | ||
| top_unix.go | ||
| top_unix_test.go | ||
| top_windows.go | ||
| trustkey.go | ||
| trustkey_test.go | ||
| unpause.go | ||
| update.go | ||
| update_linux.go | ||
| update_windows.go | ||
| util_test.go | ||
| volumes.go | ||
| volumes_linux.go | ||
| volumes_linux_test.go | ||
| volumes_unit_test.go | ||
| volumes_unix.go | ||
| volumes_unix_test.go | ||
| volumes_windows.go | ||
| wait.go | ||
| workdir.go | ||