Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
4a3948a995 | ||
|
a6a3a667ac | ||
|
006e4b0fb8 | ||
|
5d1c1ff91b | ||
|
62aa4d4d4e | ||
|
df2468d8de | ||
|
53e8111ec3 | ||
|
821281d71f |
3
.github/workflows/release.yml
vendored
3
.github/workflows/release.yml
vendored
@ -76,8 +76,7 @@ jobs:
|
|||||||
--merge \
|
--merge \
|
||||||
./helm-charts/index.yaml \
|
./helm-charts/index.yaml \
|
||||||
./helm-charts
|
./helm-charts
|
||||||
- uses: yKicchan/generate-directory-listing-action@v1
|
- {uses: gacts/directory-listing@v1, with: {overwrite: true}}
|
||||||
with: {target: ., ignore: "**/index.html", override: true}
|
|
||||||
- name: Commit and push the changes
|
- name: Commit and push the changes
|
||||||
run: |
|
run: |
|
||||||
git config user.name "${{ github.actor }}"
|
git config user.name "${{ github.actor }}"
|
||||||
|
@ -1,39 +1,44 @@
|
|||||||
#!/bin/3proxy
|
#!/bin/3proxy
|
||||||
config /etc/3proxy/3proxy.cfg
|
config /etc/3proxy/3proxy.cfg
|
||||||
|
|
||||||
# you may use system to execute some external command if proxy starts
|
|
||||||
system "echo `which 3proxy`': Starting 3proxy'"
|
system "echo `which 3proxy`': Starting 3proxy'"
|
||||||
|
|
||||||
# We can configure nservers to avoid unsafe gethostbyname() usage (max 5 servers)
|
|
||||||
{{#name_servers}}
|
{{#name_servers}}
|
||||||
nserver {{ . }}
|
nserver {{ . }}
|
||||||
{{/name_servers}}
|
{{/name_servers}}
|
||||||
|
|
||||||
# nscache is good to save speed, traffic and bandwidth
|
|
||||||
nscache {{ name_servers_cache }}
|
nscache {{ name_servers_cache }}
|
||||||
|
|
||||||
# Here we can change timeout values
|
|
||||||
timeouts 1 5 30 60 180 1800 15 60
|
timeouts 1 5 30 60 180 1800 15 60
|
||||||
|
|
||||||
# Logging docs: <https://3proxy.org/doc/howtor.html#LOGFORMAT>
|
|
||||||
log {{ log.output }}
|
log {{ log.output }}
|
||||||
logformat "-\""+_G{""time_unix"":%t, ""proxy"":{""type:"":""%N"", ""port"":%p}, ""error"":{""code"":""%E""}, ""auth"":{""user"":""%U""}, ""client"":{""ip"":""%C"", ""port"":%c}, ""server"":{""ip"":""%R"", ""port"":%r}, ""bytes"":{""sent"":%O, ""received"":%I}, ""request"":{""hostname"":""%n""}, ""message"":""%T""}"
|
logformat "-\""+_G{""time_unix"":%t, ""proxy"":{""type:"":""%N"", ""port"":%p}, ""error"":{""code"":""%E""}, ""auth"":{""user"":""%U""}, ""client"":{""ip"":""%C"", ""port"":%c}, ""server"":{""ip"":""%R"", ""port"":%r}, ""bytes"":{""sent"":%O, ""received"":%I}, ""request"":{""hostname"":""%n""}, ""message"":""%T""}"
|
||||||
|
|
||||||
maxconn {{ max_connections }}
|
maxconn {{ max_connections }}
|
||||||
|
|
||||||
{{^auth.login=}}{{^auth.password=}}
|
{{#auth.login}}
|
||||||
users {{ auth.login }}:CL:{{ auth.password }}{{#auth.extra_accounts.*}} {{ * }}:CL:{{ . }}{{/auth.extra_accounts.*}}
|
{{#auth.password}}
|
||||||
|
users {{ auth.login }}:CL:{{ auth.password }}
|
||||||
auth strong
|
auth strong
|
||||||
allow {{ auth.login }}{{#auth.extra_accounts.*}},{{ * }}{{/auth.extra_accounts.*}}
|
allow {{ auth.login }}
|
||||||
{{/auth.password=}}{{/auth.login=}}
|
{{/auth.password}}
|
||||||
|
{{/auth.login}}
|
||||||
|
|
||||||
{{^extra_config=}}
|
# Listen on both IPv4 and IPv6 for incoming and outgoing traffic
|
||||||
|
external 0.0.0.0
|
||||||
|
external ::
|
||||||
|
internal 0.0.0.0
|
||||||
|
internal ::
|
||||||
|
|
||||||
|
{{#extra_config}}
|
||||||
# Additional configuration
|
# Additional configuration
|
||||||
{{extra_config}}
|
{{extra_config}}
|
||||||
{{/extra_config=}}
|
{{/extra_config}}
|
||||||
|
|
||||||
|
# IPv4 & IPv6 Support for SOCKS5 & HTTP
|
||||||
proxy -a -p{{ ports.proxy }}
|
proxy -a -p{{ ports.proxy }}
|
||||||
socks -a -p{{ ports.socks }}
|
socks -a -p{{ ports.socks }}
|
||||||
|
|
||||||
flush
|
proxy -6 -a -p{{ ports.proxy }}
|
||||||
|
socks -6 -a -p{{ ports.socks }}
|
||||||
|
|
||||||
|
flush
|
@ -1,9 +1,9 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM docker.io/library/gcc:13.3.0 AS builder
|
FROM docker.io/library/gcc:15.1.0 AS builder
|
||||||
|
|
||||||
# renovate: source=github-tags name=3proxy/3proxy
|
# renovate: source=github-tags name=3proxy/3proxy
|
||||||
ARG Z3PROXY_VERSION=0.9.4
|
ARG Z3PROXY_VERSION=0.9.5
|
||||||
|
|
||||||
# Fetch 3proxy sources
|
# Fetch 3proxy sources
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
|
17
README.md
17
README.md
@ -1,19 +1,6 @@
|
|||||||
<p align="center">
|
# This is a fork of
|
||||||
<a href="https://github.com/tarampampam/3proxy-docker#readme">
|
https://github.com/tarampampam/3proxy-docker
|
||||||
<picture>
|
|
||||||
<source media="(prefers-color-scheme: dark)" srcset="https://socialify.git.ci/tarampampam/3proxy-docker/image?description=1&font=Raleway&forks=1&issues=1&logo=https%3A%2F%2Fgithub.com%2Fuser-attachments%2Fassets%2F023186cf-b153-459c-8417-038fd87a2065&owner=1&pulls=1&pattern=Solid&stargazers=1&theme=Dark">
|
|
||||||
<img align="center" src="https://socialify.git.ci/tarampampam/3proxy-docker/image?description=1&font=Raleway&forks=1&issues=1&logo=https%3A%2F%2Fgithub.com%2Fuser-attachments%2Fassets%2F023186cf-b153-459c-8417-038fd87a2065&owner=1&pulls=1&pattern=Solid&stargazers=1&theme=Light">
|
|
||||||
</picture>
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p align="center">
|
|
||||||
<a href="https://github.com/tarampampam/3proxy-docker/actions"><img src="https://img.shields.io/github/actions/workflow/status/tarampampam/3proxy-docker/tests.yml?branch=master&maxAge=30&label=tests&logo=github&style=flat-square" alt="" /></a>
|
|
||||||
<a href="https://github.com/tarampampam/3proxy-docker/actions"><img src="https://img.shields.io/github/actions/workflow/status/tarampampam/3proxy-docker/release.yml?maxAge=30&label=release&logo=github&style=flat-square" alt="" /></a>
|
|
||||||
<a href="https://hub.docker.com/r/tarampampam/3proxy"><img src="https://img.shields.io/docker/pulls/tarampampam/3proxy.svg?maxAge=30&label=pulls&logo=docker&logoColor=white&style=flat-square" alt="" /></a>
|
|
||||||
<a href="https://hub.docker.com/r/tarampampam/3proxy"><img src="https://img.shields.io/docker/image-size/tarampampam/3proxy/latest?maxAge=30&label=size&logo=docker&logoColor=white&style=flat-square" alt="" /></a>
|
|
||||||
<a href="https://github.com/tarampampam/3proxy-docker/blob/master/LICENSE"><img src="https://img.shields.io/github/license/tarampampam/3proxy-docker.svg?maxAge=30&style=flat-square" alt="" /></a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
# Docker image with [3proxy][link_3proxy]
|
# Docker image with [3proxy][link_3proxy]
|
||||||
|
|
||||||
|
21
docker-compose.yaml
Normal file
21
docker-compose.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
3proxy-docker:
|
||||||
|
container_name: 3proxy-server
|
||||||
|
hostname: 3proxy-server
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
network_mode: host
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
PROXY_LOGIN: username
|
||||||
|
PROXY_PASSWORD: "Password"
|
||||||
|
PRIMARY_RESOLVER: 1.1.1.1
|
||||||
|
SECONDARY_RESOLVER: 152.53.118.246
|
||||||
|
MAX_CONNECTIONS: 1024
|
||||||
|
PROXY_PORT: 3128
|
||||||
|
SOCKS_PORT: 1080
|
||||||
|
labels:
|
||||||
|
com.centurylinklabs.watchtower.enable: "false"
|
Loading…
x
Reference in New Issue
Block a user