diff options
| author | renliang <renliang@uniontech.com> | 2023-06-09 16:25:14 +0800 |
|---|---|---|
| committer | renliang <renliang@uniontech.com> | 2023-10-16 10:43:59 +0000 |
| commit | 2b771157057538498fa3ae79ef2c9a773f4f18d7 (patch) | |
| tree | 7b75222a66f430faa1fdd17f83a6071d50d8705f | |
| parent | 8498b43c1ec71ad7cea09123f91835d09f20b634 (diff) | |
| download | kolla-2b771157057538498fa3ae79ef2c9a773f4f18d7.tar.gz kolla-2b771157057538498fa3ae79ef2c9a773f4f18d7.zip | |
Fix an issue with zun-cni-daemon building images in aarch64
In the aarch64 image build,
use debian_arch to determine packages of different architectures.
Closes-Bug: #2036874
Change-Id: Ic86e6c22840f658bb68387aac688918d4db1f766
(cherry picked from commit 0eed86bb02e87c12098e52359897708e071aa07e)
| -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 |