summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-20 09:58:12 +0200
committerGitHub <noreply@github.com>2019-08-20 09:58:12 +0200
commit34fc1d09d245cbd0d922562860f639667c8641d6 (patch)
tree3e89c4fec6bd19581bfe6e3ceb9bafbda07eb1c7
parent890378e3f7fe93bd40322445e31c169fa03d8bf7 (diff)
parent29a42252cace9c3a4ed771a3d89282b64c8b7294 (diff)
downloadpodman-34fc1d09d245cbd0d922562860f639667c8641d6.tar.gz
podman-34fc1d09d245cbd0d922562860f639667c8641d6.tar.bz2
podman-34fc1d09d245cbd0d922562860f639667c8641d6.zip
Merge pull request #3853 from giuseppe/update-cni
Dockerfile.*: bump CNI plugins commit
-rw-r--r--Dockerfile2
-rw-r--r--Dockerfile.centos2
-rw-r--r--Dockerfile.fedora2
3 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 3185586b9..40726ae09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,7 +68,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install CNI plugins
-ENV CNI_COMMIT 7480240de9749f9a0a5c8614b17f1f03e0c06ab9
+ENV CNI_COMMIT 485be65581341430f9106a194a98f0f2412245fb
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \
diff --git a/Dockerfile.centos b/Dockerfile.centos
index bbb582840..f0d184485 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -27,7 +27,7 @@ RUN yum -y install btrfs-progs-devel \
iptables && yum clean all
# Install CNI plugins
-ENV CNI_COMMIT 7480240de9749f9a0a5c8614b17f1f03e0c06ab9
+ENV CNI_COMMIT 485be65581341430f9106a194a98f0f2412245fb
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 54ab690e9..48ca78bb5 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -30,7 +30,7 @@ RUN dnf -y install btrfs-progs-devel \
iptables && dnf clean all
# Install CNI plugins
-ENV CNI_COMMIT 412b6d31280682bb4fab4446f113c22ff1886554
+ENV CNI_COMMIT 485be65581341430f9106a194a98f0f2412245fb
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \