Merge branch 'rpardini:master' into refact/bash-dockerfile
commit
00bf4ad3d0
|
@ -19,7 +19,7 @@ ENV DO_DEBUG_BUILD="$DEBUG_BUILD"
|
||||||
# Build mitmproxy via pip. This is heavy, takes minutes do build and creates a 90mb+ layer. Oh well.
|
# Build mitmproxy via pip. This is heavy, takes minutes do build and creates a 90mb+ layer. Oh well.
|
||||||
RUN [[ "a$DO_DEBUG_BUILD" == "a1" ]] && { echo "Debug build ENABLED." \
|
RUN [[ "a$DO_DEBUG_BUILD" == "a1" ]] && { echo "Debug build ENABLED." \
|
||||||
&& apk add --no-cache --update su-exec git g++ libffi libffi-dev libstdc++ openssl-dev python3 python3-dev py3-pip py3-wheel py3-six py3-idna py3-certifi py3-setuptools \
|
&& apk add --no-cache --update su-exec git g++ libffi libffi-dev libstdc++ openssl-dev python3 python3-dev py3-pip py3-wheel py3-six py3-idna py3-certifi py3-setuptools \
|
||||||
&& LDFLAGS=-L/lib pip install mitmproxy==5.2 \
|
&& LDFLAGS=-L/lib pip install MarkupSafe==2.0.1 mitmproxy==5.2 \
|
||||||
&& apk del --purge git g++ libffi-dev openssl-dev python3-dev py3-pip py3-wheel \
|
&& apk del --purge git g++ libffi-dev openssl-dev python3-dev py3-pip py3-wheel \
|
||||||
&& rm -rf ~/.cache/pip \
|
&& rm -rf ~/.cache/pip \
|
||||||
; } || { echo "Debug build disabled." ; }
|
; } || { echo "Debug build disabled." ; }
|
||||||
|
|
|
@ -142,6 +142,7 @@ http {
|
||||||
set $docker_proxy_request_type "unknown-connect";
|
set $docker_proxy_request_type "unknown-connect";
|
||||||
|
|
||||||
proxy_connect;
|
proxy_connect;
|
||||||
|
proxy_connect_allow all;
|
||||||
proxy_connect_address $interceptedHost;
|
proxy_connect_address $interceptedHost;
|
||||||
proxy_max_temp_file_size 0;
|
proxy_max_temp_file_size 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue