From 2b771157057538498fa3ae79ef2c9a773f4f18d7 Mon Sep 17 00:00:00 2001 From: renliang Date: Fri, 9 Jun 2023 16:25:14 +0800 Subject: 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) --- docker/zun/zun-cni-daemon/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') 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 -- cgit v1.2.3