summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Riteau <pierre@stackhpc.com>2018-10-17 17:11:44 +0100
committerPierre Riteau <pierre@stackhpc.com>2018-10-17 17:11:44 +0100
commitc6492f610c7ee72a29da97ffa9dbf221918f9e43 (patch)
tree015e789dd8842064054c0ec864df8905c716e25f
parentb04651cf8a5a4553783fbc8b7bd2afcbb2d21be8 (diff)
downloadironic-python-agent-c6492f610c7ee72a29da97ffa9dbf221918f9e43.tar.gz
Add missing dependencies to CoreOS IPA docker image
The iptables and lshw utilities are both required for IPA: iptables is used when collecting system logs and lshw is used to get the total physical memory and system details. However, they were not installed in the docker image embedded in CoreOS IPA images. Since the docker image is used as a chroot to run IPA, it cannot access binaries available outside in the main CoreOS file system. Conflicts: Dockerfile Change-Id: Ic2188b49e717c62315db6c33b74b2e161436b052 Story: #2004092 Task: #27494 (cherry picked from commit c6ea17d413ec5e379e7eb9dcef39f5181a36380c)
-rw-r--r--Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 2296addb..b7127080 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,8 @@ RUN proxy.sh apt-get update && \
proxy.sh apt-get install -y --no-install-recommends netbase gdisk \
python2.7 python2.7-dev python-pip qemu-utils parted hdparm \
util-linux genisoimage git gcc bash coreutils tgt dmidecode \
- ipmitool psmisc dosfstools bsdmainutils open-iscsi udev && \
+ ipmitool psmisc dosfstools bsdmainutils open-iscsi udev \
+ iptables lshw && \
proxy.sh apt-get --only-upgrade -t jessie-backports install -y qemu-utils
# Some cleanup