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 0eed86bb02
)
This commit is contained in:
parent
0e6676cb0b
commit
d6731028be
|
@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% block zun_cni_daemon_version %}
|
{% block zun_cni_daemon_version %}
|
||||||
ARG zun_cni_daemon_version=0.7.1
|
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 %}
|
{% endblock %}
|
||||||
|
|
||||||
COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
|
COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
|
||||||
|
|
Loading…
Reference in New Issue