From 1fac43654cf2ec950a2b3221e27425dbcd3bbf4d Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 3 Dec 2020 22:26:29 +0100 Subject: Add support for rootless network-aliases Make sure we pass the network aliases as capability args to the cnitool in the rootless-cni-infra container. Also update the dnsname plugin in the cni-infra container. Fixes #8567 Signed-off-by: Paul Holzinger --- contrib/rootless-cni-infra/Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/rootless-cni-infra/Containerfile') diff --git a/contrib/rootless-cni-infra/Containerfile b/contrib/rootless-cni-infra/Containerfile index 579d192b9..4324f39d2 100644 --- a/contrib/rootless-cni-infra/Containerfile +++ b/contrib/rootless-cni-infra/Containerfile @@ -2,7 +2,7 @@ ARG GOLANG_VERSION=1.15 ARG ALPINE_VERSION=3.12 ARG CNI_VERSION=v0.8.0 ARG CNI_PLUGINS_VERSION=v0.8.7 -ARG DNSNAME_VERSION=v1.0.0 +ARG DNSNAME_VERSION=v1.1.1 FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} AS golang-base RUN apk add --no-cache git @@ -33,4 +33,4 @@ COPY rootless-cni-infra /usr/local/bin ENV CNI_PATH=/opt/cni/bin CMD ["sleep", "infinity"] -ENV ROOTLESS_CNI_INFRA_VERSION=4 +ENV ROOTLESS_CNI_INFRA_VERSION=5 -- cgit v1.2.3-54-g00ecf