diff options
| author | baude <bbaude@redhat.com> | 2017-12-20 15:13:52 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-22 19:23:36 +0000 |
| commit | 7f531263e6e41195278f205ad01274487cc1c1e0 (patch) | |
| tree | 1e162ee89a8302e16e743ec8d884f62d193ef2ef /Dockerfile | |
| parent | b08ac1065ca0201cd66cf53bf6fc75470a70f398 (diff) | |
| download | podman-7f531263e6e41195278f205ad01274487cc1c1e0.tar.gz podman-7f531263e6e41195278f205ad01274487cc1c1e0.tar.bz2 podman-7f531263e6e41195278f205ad01274487cc1c1e0.zip | |
Add default CNI configuration
podman needs a pair of configuration files to set up its default
network configuration: a bridge and loopback file.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #161
Approved by: baude
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Dockerfile b/Dockerfile index a07832d32..6764bdf1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,23 +79,6 @@ RUN set -x \ && cp bin/* /usr/libexec/cni \ && rm -rf "$GOPATH" -# Install custom CNI bridge test plugin -# XXX: this plugin is meant to be a replacement for the old "test_plugin_args.bash" -# we need this in testing because sandbox_run now gather IP address and the mock -# plugin wasn't able to properly setup the net ns. -# The bridge is based on the same commit as the one above. -#ENV CNI_COMMIT 6bfe036c38c8e1410f1acaa4b2ee16f1851472e4 -ENV CNI_TEST_BRANCH custom-bridge -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/runcom/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \ - && cd "$GOPATH/src/github.com/containernetworking/plugins" \ - && git checkout -q "$CNI_TEST_BRANCH" \ - && ./build.sh \ - && mkdir -p /opt/cni/bin \ - && cp bin/bridge /opt/cni/bin/bridge-custom \ - && rm -rf "$GOPATH" - # Install crictl ENV CRICTL_COMMIT 16e6fe4d7199c5689db4630a9330e6a8a12cecd1 RUN set -x \ |