openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Update qemu-utils package from testing"

Browse Source
This commit is contained in:
Jenkins 2015-09-06 14:52:12 +00:00 committed by Gerrit Code Review
commit cdb4b520eb
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Dockerfile
View File

@ -5,6 +5,10 @@ FROM debian:jessie
# different it will not cache this layer # different it will not cache this layer
ADD . /tmp/ironic-python-agent ADD . /tmp/ironic-python-agent
# Add 'testing' for qemu-utils
RUN echo 'APT::Default-Release "jessie";' > /etc/apt/apt.conf.d/10default && \
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
RUN apt-get update && \ RUN apt-get update && \
@ -12,9 +16,16 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends python2.7 python2.7-dev \ apt-get install -y --no-install-recommends 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 && \ bash coreutils tgt && \
apt-get -y autoremove && \ apt-get --only-upgrade -t testing install -y qemu-utils
# Some cleanup
RUN apt-get -y autoremove && \
apt-get clean apt-get clean
# Before cleaning mark packages that are required so they are not removed
RUN apt-mark manual python-setuptools
RUN apt-mark manual python-minimal
# Install requirements separately, because pip understands a git+https url # Install requirements separately, because pip understands a git+https url
# while setuptools doesn't # while setuptools doesn't
RUN pip install --upgrade pip RUN pip install --upgrade pip
@ -22,16 +33,12 @@ RUN pip install -r /tmp/ironic-python-agent/requirements.txt
# This will succeed because all the dependencies were installed previously # This will succeed because all the dependencies were installed previously
RUN pip install /tmp/ironic-python-agent RUN pip install /tmp/ironic-python-agent
RUN rm -rf /tmp/ironic-python-agent
RUN rm -rf /var/lib/apt/lists/*
# Before cleaning mark packages that are required so they are not removed
RUN apt-mark manual python-setuptools
RUN apt-mark manual python-minimal
# Remove no longer needed packages # Remove no longer needed packages
RUN apt-get -y purge gcc-4.6 gcc python2.7-dev git && \ RUN apt-get -y purge gcc-4.6 gcc python2.7-dev git && \
apt-get -y autoremove && \ apt-get -y autoremove && \
apt-get clean apt-get clean
RUN rm -rf /tmp/ironic-python-agent
RUN rm -rf /var/lib/apt/lists/*
CMD [ "/usr/local/bin/ironic-python-agent" ] CMD [ "/usr/local/bin/ironic-python-agent" ]