diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2017-12-13 17:47:42 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-14 23:59:22 +0000 |
| commit | 7981b7636b97c840c6913c11544aaac878deb3da (patch) | |
| tree | 6a7cf738ea0f8f094512fc394bc0a12d186751b8 | |
| parent | 21bcd770db5f4787515444179c1e6c4095585501 (diff) | |
| download | podman-7981b7636b97c840c6913c11544aaac878deb3da.tar.gz podman-7981b7636b97c840c6913c11544aaac878deb3da.tar.bz2 podman-7981b7636b97c840c6913c11544aaac878deb3da.zip | |
Change default directory for CNI plugins
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #109
Approved by: mheon
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | 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", } ) |