diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-28 04:58:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-28 04:58:28 -0500 |
commit | fb653c43ed1eb9eb9b97ca80edb8df6caab88905 (patch) | |
tree | 54e861b691d68f3f2c6b32ad00d57455dc2b9a39 /contrib/rootless-cni-infra/Containerfile | |
parent | 9d59daa7ccaea526a1aa742fadab537e77a51330 (diff) | |
parent | 1fac43654cf2ec950a2b3221e27425dbcd3bbf4d (diff) | |
download | podman-fb653c43ed1eb9eb9b97ca80edb8df6caab88905.tar.gz podman-fb653c43ed1eb9eb9b97ca80edb8df6caab88905.tar.bz2 podman-fb653c43ed1eb9eb9b97ca80edb8df6caab88905.zip |
Merge pull request #8585 from Luap99/rootless-net-alias
Add support for rootless network-aliases and static ip/mac
Diffstat (limited to 'contrib/rootless-cni-infra/Containerfile')
-rw-r--r-- | contrib/rootless-cni-infra/Containerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/rootless-cni-infra/Containerfile b/contrib/rootless-cni-infra/Containerfile index 871e06a6c..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=3 +ENV ROOTLESS_CNI_INFRA_VERSION=5 |