summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-25 21:31:50 +0100
committerGitHub <noreply@github.com>2019-02-25 21:31:50 +0100
commite45c44208067f4ac26c5136842d5a17478f5234c (patch)
treedeef90c9c3b502d137a64135ed0f125fbaeeb38b /contrib
parent6fc18e7d07e8263faca8341efb0220bf4be4f417 (diff)
parentb87bdced1fa967846916b47cba5f093f72f3d11f (diff)
downloadpodman-e45c44208067f4ac26c5136842d5a17478f5234c.tar.gz
podman-e45c44208067f4ac26c5136842d5a17478f5234c.tar.bz2
podman-e45c44208067f4ac26c5136842d5a17478f5234c.zip
Merge pull request #2358 from rhatdan/namespace
Fix up handling of user defined network namespaces
Diffstat (limited to 'contrib')
-rw-r--r--contrib/cirrus/packer/fedora_setup.sh1
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 01c468901..de7ad4506 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -40,6 +40,7 @@ ooe.sh sudo dnf install -y \
golang-github-cpuguy83-go-md2man \
gpgme-devel \
iptables \
+ iproute \
libassuan-devel \
libcap-devel \
libnet \
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 7d49c5dc7..5b7e1d714 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -48,6 +48,7 @@ ooe.sh sudo -E apt-get -qq install \
gettext \
go-md2man \
golang \
+ iproute \
iptables \
libaio-dev \
libapparmor-dev \