diff options
| author | David Weinstein <dweinst@insitusec.com> | 2015-06-07 11:06:47 -0400 |
|---|---|---|
| committer | David Weinstein <dweinst@insitusec.com> | 2015-06-07 11:06:47 -0400 |
| commit | 84b4ca6a65b74c66b2303ffd3f8e1c231dd36fde (patch) | |
| tree | e829de6b1588ca058d2a22a92878059862314268 | |
| parent | 60ee1dd3aa8673a6400df2b121724e593f103993 (diff) | |
| download | mitmproxy-84b4ca6a65b74c66b2303ffd3f8e1c231dd36fde.tar.gz mitmproxy-84b4ca6a65b74c66b2303ffd3f8e1c231dd36fde.tar.bz2 mitmproxy-84b4ca6a65b74c66b2303ffd3f8e1c231dd36fde.zip | |
match name of automated build base img
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.base-onbuild | 26 |
2 files changed, 1 insertions, 27 deletions
@@ -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 6aab378f..00000000 --- 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 |