openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Install qemu-image from backports repo"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 03:28:31 +00:00 committed by Gerrit Code Review
commit 8ce07c88be
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -13,9 +13,8 @@ ADD . /tmp/ironic-python-agent
# 1.6. Using the ARG command will be a much cleaner solution. # 1.6. Using the ARG command will be a much cleaner solution.
COPY proxy.sh /usr/bin/proxy.sh COPY proxy.sh /usr/bin/proxy.sh
# Add 'testing' for qemu-utils # Add 'backports' for qemu-utils
RUN echo 'APT::Default-Release "jessie";' > /etc/apt/apt.conf.d/10default && \ RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
sed -e 's/jessie/testing/g' /etc/apt/sources.list > /etc/apt/sources.list.d/testing.list
# Install requirements: Python for ironic-python-agent, others for putting an # Install requirements: Python for ironic-python-agent, others for putting an
# image on disk # image on disk
@ -24,7 +23,7 @@ RUN proxy.sh apt-get update && \
proxy.sh apt-get install -y --no-install-recommends gdisk python2.7 python2.7-dev \ proxy.sh apt-get install -y --no-install-recommends gdisk python2.7 python2.7-dev \
python-pip qemu-utils parted hdparm util-linux genisoimage git gcc \ python-pip qemu-utils parted hdparm util-linux genisoimage git gcc \
bash coreutils tgt dmidecode ipmitool psmisc dosfstools && \ bash coreutils tgt dmidecode ipmitool psmisc dosfstools && \
proxy.sh apt-get --only-upgrade -t testing install -y qemu-utils proxy.sh apt-get --only-upgrade -t jessie-backports install -y qemu-utils
# Some cleanup # Some cleanup
RUN proxy.sh apt-get -y autoremove && \ RUN proxy.sh apt-get -y autoremove && \