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 0112864..2eaf1cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,8 @@ FROM alpine:3.6 LABEL maintainer="Alex Doe " \ 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,12 @@ COPY --from=0 /mtproxy/sources/objs/bin/mtproto-proxy . COPY docker-entrypoint.sh / VOLUME /data -EXPOSE 2398 443 +EXPOSE 2398 +EXPOSE ${PORT} ENTRYPOINT ["/docker-entrypoint.sh"] -CMD [ \ - +CMD [ \ "--port", "2398", \ - "--http-ports", "443", \ "--slaves", "2", \ "--max-special-connections", "60000", \ "--allow-skip-dh" \ diff --git a/MTProxy b/MTProxy index 20824f5..dc0c7f3 160000 --- a/MTProxy +++ b/MTProxy @@ -1 +1 @@ -Subproject commit 20824f5fa8af3939e667fba5c1785f02059c1c43 +Subproject commit dc0c7f3de40530053189c572936ae4fd1567269b 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}