From 84b4ca6a65b74c66b2303ffd3f8e1c231dd36fde Mon Sep 17 00:00:00 2001 From: David Weinstein Date: Sun, 7 Jun 2015 11:06:47 -0400 Subject: [PATCH] match name of automated build base img --- Dockerfile | 2 +- Dockerfile.base-onbuild | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 Dockerfile.base-onbuild diff --git a/Dockerfile b/Dockerfile index e06123c78..a689ed5e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mitmproxy/base:onbuild +FROM mitmproxy/base:latest-onbuild EXPOSE 8080 EXPOSE 8081 VOLUME /certs diff --git a/Dockerfile.base-onbuild b/Dockerfile.base-onbuild deleted file mode 100644 index 6aab378f4..000000000 --- a/Dockerfile.base-onbuild +++ /dev/null @@ -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