use newer Ubuntu and Python in Dockerfile

It's necessary if using upstream SOCKS5 proxy.

Dockerfile

@@ -1,15 +1,14 @@
-FROM alpine:3.6
+FROM ubuntu:22.04
 
-RUN adduser tgproxy -u 10000 -D
+RUN apt-get update && apt-get install --no-install-recommends -y python3 python3-uvloop python3-cryptography python3-socks libcap2-bin ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN setcap cap_net_bind_service=+ep /usr/bin/python3.10
 
-RUN apk add --no-cache python3 py3-cryptography ca-certificates libcap
-
-COPY mtprotoproxy.py config.py /home/tgproxy/
-
-RUN chown -R tgproxy:tgproxy /home/tgproxy
-RUN setcap cap_net_bind_service=+ep /usr/bin/python3.6
+RUN useradd tgproxy -u 10000
 
 USER tgproxy
 
 WORKDIR /home/tgproxy/
-CMD ["./mtprotoproxy.py"]
+
+COPY --chown=tgproxy mtprotoproxy.py config.py /home/tgproxy/
+
+CMD ["python3", "mtprotoproxy.py"]

README.md

@@ -1,27 +1,34 @@
 # Async MTProto Proxy #
 
-Fast and simple to setup mtproto proxy.
+Fast and simple to setup MTProto proxy written in Python.
 
 ## Starting Up ##
     
 1. `git clone -b stable https://github.com/alexbers/mtprotoproxy.git; cd mtprotoproxy`
 2. *(optional, recommended)* edit *config.py*, set **PORT**, **USERS** and **AD_TAG**
-3. `docker-compose up --build -d` (or just `python3 mtprotoproxy.py` if you don't like docker)
-4. *(optional, shows telegram link to set the proxy)* `docker-compose logs`
+3. `docker-compose up -d` (or just `python3 mtprotoproxy.py` if you don't like Docker)
+4. *(optional, get a link to share the proxy)* `docker-compose logs`
+
+![Demo](https://alexbers.com/mtprotoproxy/install_demo_v2.gif)
 
 ## Channel Advertising ##
 
-To advertise a channel get a tag from **@MTProxybot** and write it to *config.py*.
+To advertise a channel get a tag from **@MTProxybot** and put it to *config.py*.
 
 ## Performance ##
 
 The proxy performance should be enough to comfortably serve about 4 000 simultaneous users on
 the VDS instance with 1 CPU core and 1024MB RAM.
 
+## More Instructions ##
+
+- [Running without Docker](https://github.com/alexbers/mtprotoproxy/wiki/Running-Without-Docker)
+- [Optimization and fine tuning](https://github.com/alexbers/mtprotoproxy/wiki/Optimization-and-Fine-Tuning)
+
 ## Advanced Usage ##
 
 The proxy can be launched:
 - with a custom config: `python3 mtprotoproxy.py [configfile]`
 - several times, clients will be automaticaly balanced between instances
-- using *PyPy* interprteter
-- with runtime statistics exported for [Prometheus](https://prometheus.io/): using [prometheus](https://github.com/alexbers/mtprotoproxy/tree/prometheus) branch
+- with uvloop module to get an extra speed boost
+- with runtime statistics exported to [Prometheus](https://prometheus.io/)

config.py

@@ -1,10 +1,27 @@
-PORT = 3256
+PORT = 443
 
 # name -> secret (32 hex chars)
 USERS = {
-    "tg":  "00000000000000000000000000000000",
-    "tg2": "0123456789abcdef0123456789abcdef"
+    "tg":  "00000000000000000000000000000001",
+    # "tg2": "0123456789abcdef0123456789abcdef",
 }
 
+MODES = {
+    # Classic mode, easy to detect
+    "classic": False,
+
+    # Makes the proxy harder to detect
+    # Can be incompatible with very old clients
+    "secure": False,
+
+    # Makes the proxy even more hard to detect
+    # Can be incompatible with old clients
+    "tls": True
+}
+
+# The domain for TLS mode, bad clients are proxied there
+# Use random existing domain, proxy checks it on start
+# TLS_DOMAIN = "www.google.com"
+
 # Tag for advertising, obtainable from @MTProxybot
 # AD_TAG = "3c09c680b76ee91a4c25ad51f742267d"

docker-compose.yml

@@ -4,4 +4,13 @@ services:
     build: .
     restart: unless-stopped
     network_mode: "host"
+    volumes:
+        - ./config.py:/home/tgproxy/config.py
+        - ./mtprotoproxy.py:/home/tgproxy/mtprotoproxy.py
+        - /etc/localtime:/etc/localtime:ro
+    logging:
+        driver: "json-file"
+        options:
+            max-file: "10"
+            max-size: "10m"
 #    mem_limit: 1024m