From f2496388cb050a5796134064f9afd86a7e8f267b Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 00:27:02 +0800
Subject: [PATCH 01/11] update submodule mtproxy

---
 MTProxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MTProxy b/MTProxy
index 20824f5..dc0c7f3 160000
--- a/MTProxy
+++ b/MTProxy
@@ -1 +1 @@
-Subproject commit 20824f5fa8af3939e667fba5c1785f02059c1c43
+Subproject commit dc0c7f3de40530053189c572936ae4fd1567269b

From 194290854a6fdfbaaf65b54ff3a19dcbbb7e7916 Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 01:12:12 +0800
Subject: [PATCH 02/11] change expose port

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0112864..cb18c40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,13 +31,13 @@ COPY --from=0 /mtproxy/sources/objs/bin/mtproto-proxy .
 COPY docker-entrypoint.sh /
 
 VOLUME /data
-EXPOSE 2398 443
+EXPOSE 2398 4343
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \
   
   "--port", "2398", \
-  "--http-ports", "443", \
+  "--http-ports", "4343", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From 0d772547cbd63f4af8b409080bd168c26c63ae8f Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 01:27:16 +0800
Subject: [PATCH 03/11] add env

---
 Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb18c40..dc1de2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,8 @@ FROM alpine:3.6
 LABEL maintainer="Alex Doe <alex@doe.sh>" \
       description="Telegram Messenger MTProto zero-configuration proxy server."
 
+ENV PORT=443
+
 RUN apk add --no-cache curl \
   && ln -s /usr/lib/libcrypto.so.41 /usr/lib/libcrypto.so.1.0.0
   # alpine:3.7 will need symlink to libcrypto.so.42
@@ -31,13 +33,14 @@ COPY --from=0 /mtproxy/sources/objs/bin/mtproto-proxy .
 COPY docker-entrypoint.sh /
 
 VOLUME /data
-EXPOSE 2398 4343
+EXPOSE 2398
+EXPOSE ${PORT}
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \
   
   "--port", "2398", \
-  "--http-ports", "4343", \
+  "--http-ports", "${PORT}", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From 7aadf6d75524c1fee6b1a6b54e5b6596829f9b3c Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 01:29:04 +0800
Subject: [PATCH 04/11] fix string error

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dc1de2b..1d010d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,7 @@ ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \
   
   "--port", "2398", \
-  "--http-ports", "${PORT}", \
+  "--http-ports", "$PORT", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From bcc44fb00ba79bb9e805e95ac32517df475ed207 Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 01:34:45 +0800
Subject: [PATCH 05/11] fix $

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1d010d4..617c83e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,7 @@ ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \
   
   "--port", "2398", \
-  "--http-ports", "$PORT", \
+  "--http-ports", "\$PORT", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From 8c2d50397412fc867c25a19f9c1be73caf871e9b Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 01:42:29 +0800
Subject: [PATCH 06/11] remove "

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 617c83e..e3bf7b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,7 @@ ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \
   
   "--port", "2398", \
-  "--http-ports", "\$PORT", \
+  "--http-ports", $PORT, \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From c57aee12a2c27e2bcc915bbb221a2ea9e853fc7f Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 01:48:16 +0800
Subject: [PATCH 07/11] remove space

---
 .gitignore | 1 +
 Dockerfile | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dd04e98
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+config/*
diff --git a/Dockerfile b/Dockerfile
index e3bf7b5..6ef90ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,8 +37,7 @@ EXPOSE 2398
 EXPOSE ${PORT}
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD [ \
-  
+CMD [ \  
   "--port", "2398", \
   "--http-ports", $PORT, \
   "--slaves", "2", \

From 3197d5f96a37fae93e1298c59232685ed86c0b0c Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 01:51:14 +0800
Subject: [PATCH 08/11] check

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6ef90ee..9b86ad6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ EXPOSE ${PORT}
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \  
   "--port", "2398", \
-  "--http-ports", $PORT, \
+  "--http-ports", "${PORT}", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From 0d47f8ca3bab812a0e6775dd4e8c6d062fd7bd72 Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 02:00:59 +0800
Subject: [PATCH 09/11] combine

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9b86ad6..0d6aca5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ EXPOSE ${PORT}
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \  
   "--port", "2398", \
-  "--http-ports", "${PORT}", \
+  "--http-ports ${PORT}", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From e4f14805253bc3e4f17946c9d22ac2f308944643 Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 02:11:31 +0800
Subject: [PATCH 10/11] test ''

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0d6aca5..306374e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ EXPOSE ${PORT}
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \  
   "--port", "2398", \
-  "--http-ports ${PORT}", \
+  "--http-ports", "`echo ${PORT}`", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \

From 4dcc740e77b3db84f645d4e7655e8fc2323fe5d6 Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Mon, 1 Mar 2021 02:18:14 +0800
Subject: [PATCH 11/11] change port setting

---
 Dockerfile           | 1 -
 docker-entrypoint.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 306374e..2eaf1cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,6 @@ EXPOSE ${PORT}
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD [ \  
   "--port", "2398", \
-  "--http-ports", "`echo ${PORT}`", \
   "--slaves", "2", \
   "--max-special-connections", "60000", \
   "--allow-skip-dh" \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 54f7b41..fc1ea55 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -112,4 +112,4 @@ echo '[+] Starting proxy...'
 sleep 1
 
 # exec /mtproxy/mtproto-proxy -p 2398 -H 443 -M "$WORKERS" -C 60000 --aes-pwd /etc/telegram/hello-explorers-how-are-you-doing -u root $CONFIG --allow-skip-dh --nat-info "$INTERNAL_IP:$IP" $SECRET_CMD $TAG_CMD
-exec /mtproxy/mtproto-proxy "$@" --aes-pwd ${REMOTE_SECRET} --user root ${REMOTE_CONFIG} --nat-info "$INTERNAL_IP:$EXTERNAL_IP" ${SECRET_CMD} ${TAG_CMD}
+exec /mtproxy/mtproto-proxy "$@" --http-ports ${PORT} --aes-pwd ${REMOTE_SECRET} --user root ${REMOTE_CONFIG} --nat-info "$INTERNAL_IP:$EXTERNAL_IP" ${SECRET_CMD} ${TAG_CMD}