diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-20 16:10:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-20 16:10:54 +0000 |
| commit | d318e5c1a193914ee90eab1c9a762d61d1b07acb (patch) | |
| tree | 4b44230954313de06139768a9d674317212395ad /docker | |
| parent | 42720bcab86e0008feb7a0f55523d16455960069 (diff) | |
| parent | 8c86f867dbecf3c0512283623bb031f1152d5c41 (diff) | |
| download | kolla-d318e5c1a193914ee90eab1c9a762d61d1b07acb.tar.gz kolla-d318e5c1a193914ee90eab1c9a762d61d1b07acb.zip | |
Merge "Zun: add CNI loopback binary to the image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/zun/zun-cni-daemon/Dockerfile.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2 index dc4a05e37..13eae9491 100644 --- a/docker/zun/zun-cni-daemon/Dockerfile.j2 +++ b/docker/zun/zun-cni-daemon/Dockerfile.j2 @@ -36,5 +36,9 @@ COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers RUN chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_zun_sudoers +RUN curl -sSL -o /tmp/cni-plugins-v0.7.1.tgz https://github.com/containernetworking/plugins/releases/download/v0.7.1/cni-plugins-amd64-v0.7.1.tgz \ + && tar -C /opt -xzvf /tmp/cni-plugins-v0.7.1.tgz ./loopback \ + && rm -f /tmp/cni-plugins-v0.7.1.tgz + {% block zun_cni_daemon_footer %}{% endblock %} {% block footer %}{% endblock %} |