From 4583fa79222d9b1d035efa0701fc03525747b46c Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 16 Feb 2016 00:57:42 +0100 Subject: remove MANIFEST.in, move Dockerfile to root --- .dockerignore | 1 + Dockerfile | 4 ++++ mitmproxy/.dockerignore | 1 - mitmproxy/Dockerfile | 4 ---- mitmproxy/MANIFEST.in | 7 ------- netlib/MANIFEST.in | 4 ---- pathod/MANIFEST.in | 6 ------ 7 files changed, 5 insertions(+), 22 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile delete mode 100644 mitmproxy/.dockerignore delete mode 100644 mitmproxy/Dockerfile delete mode 100644 mitmproxy/MANIFEST.in delete mode 100644 netlib/MANIFEST.in delete mode 100644 pathod/MANIFEST.in diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..6b8710a7 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.git diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..a689ed5e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM mitmproxy/base:latest-onbuild +EXPOSE 8080 +EXPOSE 8081 +VOLUME /certs diff --git a/mitmproxy/.dockerignore b/mitmproxy/.dockerignore deleted file mode 100644 index 6b8710a7..00000000 --- a/mitmproxy/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/mitmproxy/Dockerfile b/mitmproxy/Dockerfile deleted file mode 100644 index a689ed5e..00000000 --- a/mitmproxy/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM mitmproxy/base:latest-onbuild -EXPOSE 8080 -EXPOSE 8081 -VOLUME /certs diff --git a/mitmproxy/MANIFEST.in b/mitmproxy/MANIFEST.in deleted file mode 100644 index bd612fd2..00000000 --- a/mitmproxy/MANIFEST.in +++ /dev/null @@ -1,7 +0,0 @@ -include mitmproxy mitmdump mitmweb -include LICENSE CHANGELOG CONTRIBUTORS CONTRIBUTING.md README.rst -graft examples -graft libmproxy -graft test -prune test/tools -recursive-exclude * *.pyc *.pyo *.swo *.swp *.map diff --git a/netlib/MANIFEST.in b/netlib/MANIFEST.in deleted file mode 100644 index db0e2ed6..00000000 --- a/netlib/MANIFEST.in +++ /dev/null @@ -1,4 +0,0 @@ -include LICENSE CONTRIBUTORS README.rst -graft test -prune test/tools -recursive-exclude * *.pyc *.pyo *.swo *.swp \ No newline at end of file diff --git a/pathod/MANIFEST.in b/pathod/MANIFEST.in deleted file mode 100644 index f492b0ef..00000000 --- a/pathod/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -include LICENSE CHANGELOG README.txt -exclude README.mkd -recursive-include test * -recursive-include libpathod * -recursive-include examples * -recursive-exclude * *.pyc *.pyo *.swo *.swp \ No newline at end of file -- cgit v1.2.3