diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2022-09-23 19:40:11 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2022-09-26 12:05:37 +0200 |
| commit | 528428919ecd0c60f04400c67b49820ac21b575d (patch) | |
| tree | d772306b30b374603fc03019807339ef859e85c4 /builder | |
| parent | 571baffd593bf73586c3a37d248649c853c1c75c (diff) | |
| download | docker-528428919ecd0c60f04400c67b49820ac21b575d.tar.gz | |
libnetwork/config: merge DaemonCfg into Config
It was unclear what the distinction was between these configuration
structs, so merging them to simplify.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder-next/executor_unix.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go index 55209d8c8a..919e2bb2cf 100644 --- a/builder/builder-next/executor_unix.go +++ b/builder/builder-next/executor_unix.go @@ -128,7 +128,7 @@ func (iface *lnInterface) Set(s *specs.Spec) error { s.Hooks = &specs.Hooks{ Prestart: []specs.Hook{{ Path: filepath.Join("/proc", strconv.Itoa(os.Getpid()), "exe"), - Args: []string{"libnetwork-setkey", "-exec-root=" + iface.provider.Config().Daemon.ExecRoot, iface.sbx.ContainerID(), shortNetCtlrID}, + Args: []string{"libnetwork-setkey", "-exec-root=" + iface.provider.Config().ExecRoot, iface.sbx.ContainerID(), shortNetCtlrID}, }}, } return nil |