diff options
| author | Zuul <zuul@review.opendev.org> | 2023-10-20 11:47:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-10-20 11:47:04 +0000 |
| commit | 2f61fc9e3876c25de8ca53cf2650d79af0f4556c (patch) | |
| tree | f8dac5c00e69f53e2eb56501946bf17a2c0abc20 | |
| parent | ee4c225e57a9b68b224173d813ddf9bb5328663c (diff) | |
| parent | 2b771157057538498fa3ae79ef2c9a773f4f18d7 (diff) | |
| download | kolla-2f61fc9e3876c25de8ca53cf2650d79af0f4556c.tar.gz kolla-2f61fc9e3876c25de8ca53cf2650d79af0f4556c.zip | |
Merge "Fix an issue with zun-cni-daemon building images in aarch64" into stable/zed
| -rw-r--r-- | docker/zun/zun-cni-daemon/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2 index 826351443..3046dcd9f 100644 --- a/docker/zun/zun-cni-daemon/Dockerfile.j2 +++ b/docker/zun/zun-cni-daemon/Dockerfile.j2 @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block zun_cni_daemon_version %} ARG zun_cni_daemon_version=0.7.1 -ARG zun_cni_daemon_url=https://github.com/containernetworking/plugins/releases/download/v${zun_cni_daemon_version}/cni-plugins-amd64-v${zun_cni_daemon_version}.tgz +ARG zun_cni_daemon_url=https://github.com/containernetworking/plugins/releases/download/v${zun_cni_daemon_version}/cni-plugins-{{debian_arch}}-v${zun_cni_daemon_version}.tgz {% endblock %} COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers |