fix upstream config

This commit is contained in:
OCram85 2023-07-10 17:17:59 +02:00
parent 167ca2f41f
commit 555447f32c

View File

@ -23,6 +23,7 @@ ENV TINYPROXY_UID 5123
ENV TINYPROXY_GID 5123 ENV TINYPROXY_GID 5123
ENV UPSTREAM_PROXY "" ENV UPSTREAM_PROXY ""
ENV UPSTREAM_PROXY_FILE ""
ENV PORT "8888" ENV PORT "8888"
ENV TIMEOUT "600" ENV TIMEOUT "600"
ENV LOGLEVEL "Info" ENV LOGLEVEL "Info"
@ -49,8 +50,6 @@ LogLevel $LOGLEVEL
MaxClients $MAXCLIENTS MaxClients $MAXCLIENTS
ViaProxyName "tinyproxy" ViaProxyName "tinyproxy"
#upstream http $UPSTREAM_PROXY "."
Filter "$FILTER_FILE" Filter "$FILTER_FILE"
FilterURLs Off FilterURLs Off
FilterCaseSensitive Off FilterCaseSensitive Off
@ -58,8 +57,14 @@ FilterDefaultDeny Yes
Allow 127.0.0.1/8 Allow 127.0.0.1/8
Allow 10.0.0.0/8 Allow 10.0.0.0/8
EOF EOF
RUN set -eu && \
CONFIG='/etc/tinyproxy/tinyproxy.conf' && \
[ -z "$UPSTREAM_PROXY_FILE" ] || export UPSTREAM_PROXY=$(cat $UPSTREAM_PROXY_FILE) && \
[ -z "$UPSTREAM_PROXY" ] || echo "upstream http $UPSTREAM_PROXY \".\"" >> "$CONFIG"
RUN chown -R ${TINYPROXY_UID}:${TINYPROXY_GID} /etc/tinyproxy /var/log/tinyproxy RUN chown -R ${TINYPROXY_UID}:${TINYPROXY_GID} /etc/tinyproxy /var/log/tinyproxy
USER ${TINYPROXY_UID}:${TINYPROXY_GID} USER ${TINYPROXY_UID}:${TINYPROXY_GID}