tinyproxy 1.11.0-rc1
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Aleksander Cynarski 2021-03-27 12:29:48 +01:00
parent 82009192e3
commit b5011fb187
Signed by: paramah
GPG Key ID: C4340BA42B9C173A
7 changed files with 59 additions and 17 deletions

View File

@ -25,9 +25,9 @@ steps:
from_secret: telegram_group_id from_secret: telegram_group_id
message: > message: >
{{#success build.status}} {{#success build.status}}
build {{build.link}} triggerd by {{commit.link}} from {{commit.author}} succeeded SUCCESSED! build {{build.link}} triggerd by {{commit.link}} from {{commit.author}}
{{else}} {{else}}
build {{build.link}} triggerd by {{commit.link}} from {{commit.author}} failed FAILED! build {{build.link}} triggerd by {{commit.link}} from {{commit.author}}
{{/success}} {{/success}}
when: when:
status: status:

View File

@ -1,15 +1,30 @@
FROM paramah/base:alpine as base-config FROM travix/base-alpine:3.5 as builder
FROM alpine ENV TINYPROXY_VERSION=1.11.0-rc1
RUN adduser -D -u 2000 -h /var/run/tinyproxy -s /sbin/nologin tinyproxy tinyproxy \
&& apk --update add -t build-dependencies \
make \
automake \
autoconf \
g++ \
asciidoc \
git \
&& rm -rf /var/cache/apk/* \
&& git clone -b ${TINYPROXY_VERSION} --depth=1 https://github.com/tinyproxy/tinyproxy.git /tmp/tinyproxy \
&& cd /tmp/tinyproxy \
&& ./autogen.sh \
&& ./configure --enable-transparent --prefix="" \
&& make \
&& make install
FROM alpine:3.5
MAINTAINER Aleksander Cynarski <aleksander@cynarski.pl> MAINTAINER Aleksander Cynarski <aleksander@cynarski.pl>
COPY --from=base-config /etc/supervisor /etc/supervisor
RUN set -xe \ RUN set -xe \
&& apk add --no-cache wget curl bash openssh supervisor tinyproxy \ && apk add --no-cache wget curl bash openssh
&& sed -i -e '/^Allow /s/^/#/' \
-e '/^ConnectPort /s/^/#/' \ COPY --from=builder /bin/tinyproxy /usr/bin/tinyproxy
-e '/^#DisableViaHeader /s/^#//' \
/etc/tinyproxy/tinyproxy.conf
ENV DOCKERIZE_VERSION v0.6.1 ENV DOCKERIZE_VERSION v0.6.1
# Install dockerize # Install dockerize
@ -18,7 +33,9 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
COPY docker/etc /etc COPY docker/etc /etc
COPY docker/*-entrypoint.sh /usr/sbin/
EXPOSE 8888 EXPOSE 8888
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["/usr/bin/tinyproxy", "-d"]

19
README.md Normal file
View File

@ -0,0 +1,19 @@
# Tinyproxy 1.11.0-rc1
## Usage (docker-compose)
```
version: "3.5"
services:
tinyproxy:
image: paramah/tinyproxy
networks:
- proxy_network
ports:
- "8888:8888"
environment:
TINYPROXY_TIMEOUT: 10
TINYPROXY_MAXCLIENTS: 200
```

8
docker/docker-entrypoint.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh
set -e
echo "Configure tinyproxy"
dockerize -template /etc/tinyproxy/tinyproxy.conf.template:/etc/tinyproxy/tinyproxy.conf
echo "Done."
exec "$@"

View File

@ -1,6 +0,0 @@
[program:tinyproxy]
command=/usr/bin/tinyproxy -d
autorestart=true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
redirect_stderr=true

View File

@ -0,0 +1,4 @@
Port 8888
Timeout {{ default .Env.TINYPROXY_TIMEOUT "60" }}
LogLevel Info
MaxClients {{ default .Env.TINYPROXY_MAXCLIENTS "100" }}