Compare commits
3 Commits
v1.11.0
...
v1.11.0-rc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3cbe16f0e8 | ||
|
|
2a0d771bcc | ||
|
|
80634ef5e5 |
@@ -2,19 +2,19 @@
|
|||||||
|
|
||||||
FROM gcc:13.3.0 AS builder
|
FROM gcc:13.3.0 AS builder
|
||||||
|
|
||||||
# renovate: source=github-tags name=3proxy/3proxy
|
# renovate: source=github-tags name=z3APA3A/3proxy
|
||||||
ARG Z3PROXY_VERSION=0.9.4
|
ARG Z3PROXY_VERSION=0.9.4
|
||||||
|
|
||||||
# Fetch 3proxy sources
|
# Fetch 3proxy sources
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& git -c advice.detachedHead=false clone --depth 1 --branch "${Z3PROXY_VERSION}" https://github.com/3proxy/3proxy.git /tmp/3proxy
|
&& git -c advice.detachedHead=false clone --depth 1 --branch "${Z3PROXY_VERSION}" https://github.com/z3APA3A/3proxy.git /tmp/3proxy
|
||||||
|
|
||||||
WORKDIR /tmp/3proxy
|
WORKDIR /tmp/3proxy
|
||||||
|
|
||||||
# Patch sources
|
# Patch sources
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& echo '#define ANONYMOUS 1' >> ./src/3proxy.h \
|
&& echo '#define ANONYMOUS 1' >> ./src/3proxy.h \
|
||||||
# proxy.c source: <https://github.com/3proxy/3proxy/blob/0.9.3/src/proxy.c>
|
# proxy.c source: <https://github.com/z3APA3A/3proxy/blob/0.9.3/src/proxy.c>
|
||||||
&& sed -i 's~\(<\/head>\)~<style>:root{--color-bg-primary:#fff;--color-text-primary:#131313;--color-text-secondary:#232323}\
|
&& sed -i 's~\(<\/head>\)~<style>:root{--color-bg-primary:#fff;--color-text-primary:#131313;--color-text-secondary:#232323}\
|
||||||
@media (prefers-color-scheme: dark){:root{--color-bg-primary:#212121;--color-text-primary:#fafafa;--color-text-secondary:#bbb}}\
|
@media (prefers-color-scheme: dark){:root{--color-bg-primary:#212121;--color-text-primary:#fafafa;--color-text-secondary:#bbb}}\
|
||||||
html,body{height:100%;font-family:sans-serif;background-color:var(--color-bg-primary);color:var(--color-text-primary);margin:0;\
|
html,body{height:100%;font-family:sans-serif;background-color:var(--color-bg-primary);color:var(--color-text-primary);margin:0;\
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ Example usage:
|
|||||||
docker run --rm -d \
|
docker run --rm -d \
|
||||||
-p "3128:3128/tcp" \
|
-p "3128:3128/tcp" \
|
||||||
-p "1080:1080/tcp" \
|
-p "1080:1080/tcp" \
|
||||||
ghcr.io/tarampampam/3proxy:1
|
ghcr.io/tarampampam/3proxy:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
With authentication and custom resolver settings:
|
With authentication and custom resolver settings:
|
||||||
@@ -96,7 +96,7 @@ docker run --rm -d \
|
|||||||
-e "PROXY_LOGIN=evil" \
|
-e "PROXY_LOGIN=evil" \
|
||||||
-e "PROXY_PASSWORD=live" \
|
-e "PROXY_PASSWORD=live" \
|
||||||
-e "PRIMARY_RESOLVER=2001:4860:4860::8888" \
|
-e "PRIMARY_RESOLVER=2001:4860:4860::8888" \
|
||||||
ghcr.io/tarampampam/3proxy:1
|
ghcr.io/tarampampam/3proxy:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
Docker compose example:
|
Docker compose example:
|
||||||
@@ -104,7 +104,7 @@ Docker compose example:
|
|||||||
```yaml
|
```yaml
|
||||||
services:
|
services:
|
||||||
3proxy:
|
3proxy:
|
||||||
image: ghcr.io/tarampampam/3proxy:1
|
image: ghcr.io/tarampampam/3proxy:latest
|
||||||
environment:
|
environment:
|
||||||
PROXY_LOGIN: evil
|
PROXY_LOGIN: evil
|
||||||
PROXY_PASSWORD: live
|
PROXY_PASSWORD: live
|
||||||
@@ -148,4 +148,4 @@ This project is licensed under the WTFPL. Use it freely and enjoy!
|
|||||||
[link_docker_tags]:https://hub.docker.com/r/tarampampam/3proxy/tags
|
[link_docker_tags]:https://hub.docker.com/r/tarampampam/3proxy/tags
|
||||||
[link_docker_hub]:https://hub.docker.com/r/tarampampam/3proxy/
|
[link_docker_hub]:https://hub.docker.com/r/tarampampam/3proxy/
|
||||||
[link_ghcr]:https://github.com/tarampampam/3proxy-docker/pkgs/container/3proxy
|
[link_ghcr]:https://github.com/tarampampam/3proxy-docker/pkgs/container/3proxy
|
||||||
[link_3proxy]:https://github.com/3proxy/3proxy
|
[link_3proxy]:https://github.com/z3APA3A/3proxy
|
||||||
|
|||||||
@@ -8,6 +8,4 @@ type: application
|
|||||||
version: 0.0.0 # will be replaced by the release workflow
|
version: 0.0.0 # will be replaced by the release workflow
|
||||||
appVersion: 0.0.0 # will be replaced by the release workflow
|
appVersion: 0.0.0 # will be replaced by the release workflow
|
||||||
icon: https://github.com/user-attachments/assets/023186cf-b153-459c-8417-038fd87a2065
|
icon: https://github.com/user-attachments/assets/023186cf-b153-459c-8417-038fd87a2065
|
||||||
home: https://github.com/3proxy/3proxy
|
|
||||||
sources: [https://github.com/tarampampam/3proxy-docker]
|
sources: [https://github.com/tarampampam/3proxy-docker]
|
||||||
keywords: [proxy, 3proxy, http, socks]
|
|
||||||
|
|||||||
@@ -10,10 +10,10 @@ Also, this chart does not include Ingress configuration. If you need it, please,
|
|||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
helm repo add proxy-3proxy https://tarampampam.github.io/3proxy-docker/helm-charts
|
helm repo add tarampampam https://tarampampam.github.io/3proxy-docker/helm-charts
|
||||||
helm repo update
|
helm repo update
|
||||||
|
|
||||||
helm install my-3proxy proxy-3proxy/proxy-3proxy --version <version_here>
|
helm install proxy-3proxy tarampampam/proxy-3proxy
|
||||||
```
|
```
|
||||||
|
|
||||||
Alternatively, add the following lines to your `Chart.yaml`:
|
Alternatively, add the following lines to your `Chart.yaml`:
|
||||||
@@ -21,8 +21,8 @@ Alternatively, add the following lines to your `Chart.yaml`:
|
|||||||
```yaml
|
```yaml
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: proxy-3proxy
|
- name: proxy-3proxy
|
||||||
version: <version_here>
|
version: <version>
|
||||||
repository: https://tarampampam.github.io/3proxy-docker/helm-charts
|
repository: https://tarampampam.github.io/proxy-3proxy/helm-charts
|
||||||
```
|
```
|
||||||
|
|
||||||
And override the default values in your `values.yaml`:
|
And override the default values in your `values.yaml`:
|
||||||
@@ -30,6 +30,6 @@ And override the default values in your `values.yaml`:
|
|||||||
```yaml
|
```yaml
|
||||||
proxy-3proxy:
|
proxy-3proxy:
|
||||||
# ...
|
# ...
|
||||||
service: {ports: {http: 3128}}
|
service: {port: 8800}
|
||||||
# ...
|
# ...
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ spec:
|
|||||||
port: {{ .ports.http }}
|
port: {{ .ports.http }}
|
||||||
targetPort: http
|
targetPort: http
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
- name: socks
|
- name: http
|
||||||
port: {{ .ports.socks }}
|
port: {{ .ports.socks }}
|
||||||
targetPort: socks
|
targetPort: socks
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
|||||||
Reference in New Issue
Block a user