Adds entrypoint #6

Merged
OCram85 merged 4 commits from entrypoint into main 2023-07-12 10:55:59 +02:00
2 changed files with 50 additions and 30 deletions
Showing only changes of commit 5b0cab4a4e - Show all commits

View File

@ -34,40 +34,17 @@ ENV FILTER_FILE "/etc/tinyproxy/filter"
RUN apk add --no-cache \
tinyproxy curl
RUN mv /etc/tinyproxy/tinyproxy.conf /etc/tinyproxy/tinyproxy.default.conf
RUN mv /etc/tinyproxy/tinyproxy.conf /etc/tinyproxy/tinyproxy.default.conf && \
touch /etc/tinyproxy/tinyproxy.conf
RUN <<EOF cat >> /etc/tinyproxy/tinyproxy.conf
User $TINYPROXY_UID
Group $TINYPROXY_GID
Port $PORT
Timeout $TIMEOUT
DefaultErrorFile "/usr/share/tinyproxy/default.html"
StatHost "tinyproxy.stats"
StatFile "/usr/share/tinyproxy/stats.html"
LogLevel $LOGLEVEL
MaxClients $MAXCLIENTS
ViaProxyName "tinyproxy"
Filter "$FILTER_FILE"
FilterURLs Off
FilterCaseSensitive Off
FilterDefaultDeny Yes
Allow 127.0.0.1/8
Allow 10.0.0.0/8
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"
WORKDIR /swarmproxy
COPY entrypoint.sh entrypoint.sh
RUN chown -R ${TINYPROXY_UID}:${TINYPROXY_GID} /etc/tinyproxy /var/log/tinyproxy
USER ${TINYPROXY_UID}:${TINYPROXY_GID}
EXPOSE 8888
ENTRYPOINT ["/usr/bin/tinyproxy", "-d"]
ENTRYPOINT ["/swarmproxy/entrypoint.sh"]
CMD ["/usr/bin/tinyproxy", "-d"]

43
entrypoint.sh Normal file
View File

@ -0,0 +1,43 @@
#!/usr/bin/env bash
set -e
CONFIG = "/etc/tinyrpoxy/tinyproxy.conf"
function writeConfig() {
cat << EOF >> "$CONFIG"
User $TINYPROXY_UID
Group $TINYPROXY_GID
Port $PORT
Timeout $TIMEOUT
DefaultErrorFile "/usr/share/tinyproxy/default.html"
StatHost "tinyproxy.stats"
StatFile "/usr/share/tinyproxy/stats.html"
LogLevel $LOGLEVEL
MaxClients $MAXCLIENTS
ViaProxyName "tinyproxy"
Filter "$FILTER_FILE"
FilterURLs Off
FilterCaseSensitive Off
FilterDefaultDeny Yes
Allow 127.0.0.1/8
Allow 10.0.0.0/8
EOF
}
function addUpstreamConfig() {
[ -z "$UPSTREAM_PROXY_FILE" ] || export UPSTREAM_PROXY=$(cat $UPSTREAM_PROXY_FILE)
[ -z "$UPSTREAM_PROXY" ] || echo "upstream http $UPSTREAM_PROXY \".\"" >> "$CONFIG"
}
function main() {
writeConfig
addUpstreamConfig
}
main $@