Merge pull request #613 from dweinstein/patch/docker-tweaks

match name of automated build base img
This commit is contained in:
David Weinstein 2015-06-07 21:43:26 -04:00
commit 9b70d4bd2a
2 changed files with 1 additions and 27 deletions

View File

@ -1,4 +1,4 @@
FROM mitmproxy/base:onbuild FROM mitmproxy/base:latest-onbuild
EXPOSE 8080 EXPOSE 8080
EXPOSE 8081 EXPOSE 8081
VOLUME /certs VOLUME /certs

View File

@ -1,26 +0,0 @@
FROM debian:jessie
ENV DEBIAN_FRONTEND noninteractive
ENV PYTHON /usr/bin/python2.7
RUN apt-get update && \
apt-get install -qq -y --no-install-recommends \
build-essential \
python-pip \
python-dev \
python-setuptools \
libffi-dev \
libxml2-dev \
libxslt1-dev \
git \
zlib1g-dev \
libssl-dev && \
rm -rf /var/lib/apt/lists/*
ENV LANG en_US.UTF-8
ENV LC_ALL C.UTF-8
ONBUILD ADD . /opt/mitmproxy
ONBUILD WORKDIR /opt/mitmproxy
ONBUILD RUN [ ! -e requirements.txt ] || pip install -r requirements.txt && \
rm -rf ~/.cache/pip /tmp/pip_build_root