From 7981b7636b97c840c6913c11544aaac878deb3da Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 13 Dec 2017 17:47:42 -0500 Subject: Change default directory for CNI plugins Signed-off-by: Matthew Heon Closes: #109 Approved by: mheon --- Dockerfile | 4 ++-- libpod/runtime.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 548da0a1f..a07832d32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,8 +75,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/containernetworking/plugins" \ && git checkout -q "$CNI_COMMIT" \ && ./build.sh \ - && mkdir -p /opt/cni/bin \ - && cp bin/* /opt/cni/bin/ \ + && mkdir -p /usr/libexec/cni \ + && cp bin/* /usr/libexec/cni \ && rm -rf "$GOPATH" # Install custom CNI bridge test plugin diff --git a/libpod/runtime.go b/libpod/runtime.go index 480da6677..91c6c7683 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -75,7 +75,7 @@ var ( MaxLogSize: -1, NoPivotRoot: false, CNIConfigDir: "/etc/cni/net.d/", - CNIPluginDir: "/opt/cni/bin/", + CNIPluginDir: "/usr/libexec/cni", } ) -- cgit v1.2.3-54-g00ecf