Simplify the dockerfiles using a dockerignore.
This commit is contained in:
parent
6af6305edd
commit
78a2590631
3 changed files with 43 additions and 83 deletions
|
@ -1,45 +1,30 @@
|
|||
FROM phusion/baseimage:0.9.10
|
||||
FROM phusion/baseimage:0.9.11
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV HOME /root
|
||||
WORKDIR /
|
||||
|
||||
RUN apt-get update # 20JUN2014
|
||||
RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62-dev libevent-dev gdebi-core g++ libmagic1
|
||||
# Install the dependencies.
|
||||
RUN apt-get update # 15JUL2014
|
||||
|
||||
# New ubuntu packages should be added as their own apt-get install lines below the existing install commands
|
||||
RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62-dev libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap2-dev libsasl2-dev
|
||||
|
||||
# Build the python dependencies
|
||||
ADD requirements.txt requirements.txt
|
||||
RUN virtualenv --distribute venv
|
||||
RUN venv/bin/pip install -r requirements.txt
|
||||
|
||||
### End common section ###
|
||||
|
||||
RUN apt-get install -y libldap2-dev libsasl2-dev
|
||||
|
||||
RUN apt-get install -y lxc aufs-tools
|
||||
|
||||
RUN usermod -v 100000-200000 -w 100000-200000 root
|
||||
|
||||
ADD binary_dependencies/builder binary_dependencies/builder
|
||||
|
||||
RUN gdebi --n binary_dependencies/builder/*.deb
|
||||
|
||||
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
ADD requirements.txt requirements.txt
|
||||
RUN virtualenv --distribute venv
|
||||
RUN venv/bin/pip install -r requirements.txt
|
||||
|
||||
ADD buildstatus buildstatus
|
||||
ADD data data
|
||||
ADD features features
|
||||
ADD storage storage
|
||||
ADD util util
|
||||
ADD workers workers
|
||||
|
||||
ADD app.py app.py
|
||||
ADD config.py config.py
|
||||
ADD license.pyc license.pyc
|
||||
|
||||
# Remove this if we ever stop depending on test data for the default config
|
||||
ADD test test
|
||||
|
||||
ADD conf conf
|
||||
RUN rm -rf /conf/stack
|
||||
ADD . .
|
||||
|
||||
ADD conf/init/svlogd_config /svlogd_config
|
||||
ADD conf/init/preplogsdir.sh /etc/my_init.d/
|
||||
|
|
Reference in a new issue