openstack/ironic-python-agent
Code Issues Proposed changes

Renaming things in Dockerfile

Browse Source
This commit is contained in:
Josh Gachnang
2014-03-19 16:27:43 -07:00
parent 5914e36b30
commit 63fa74582d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@@ -1,21 +1,21 @@
FROM jayofdoom/docker-ubuntu-14.04 FROM jayofdoom/docker-ubuntu-14.04
#TODO(pcsforeducation) ask Jay what we can change here
# The add is before the RUN to ensure we get the latest version of packages # The add is before the RUN to ensure we get the latest version of packages
# Docker will cache RUN commands, but because the SHA1 of the dir will be # Docker will cache RUN commands, but because the SHA1 of the dir will be
# different it will not cache this layer # different it will not cache this layer
ADD . /tmp/teeth-agent ADD . /tmp/ironic-python-agent
# Install requirements: Python for teeth-agent, others for putting an image on disk # Install requirements: Python for ironic-python-agent, others for putting an
# image on disk
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
python python-pip python-dev \ python python-pip python-dev \
qemu-utils parted util-linux genisoimage git qemu-utils parted util-linux genisoimage git
# Install requirements separately, because pip understands a git+https url while setuptools doesn't # Install requirements separately, because pip understands a git+https url
RUN pip install -r /tmp/teeth-agent/requirements.txt # while setuptools doesn't
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/teeth-agent RUN pip install /tmp/ironic-python-agent
CMD [ "/usr/local/bin/teeth-agent" ] CMD [ "/usr/local/bin/ironic-python-agent" ]