astelm
/
tg-ws-proxy
mirror of https://github.com/Flowseal/tg-ws-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker: entrypoint script and CRLF-safe build https://github.com/Flowseal/tg-ws-proxy/issues/490#issuecomment-4154668985 

Вынес инлайн-команду из ENTRYPOINT в отдельный скрипт docker/entrypoint.sh. Так надёжнее: не нужно мучиться с экранированием кавычек и копипастой (https://github.com/Flowseal/tg-ws-proxy/issues/490#issuecomment-4154668985).
Добавил запуск sed прямо в образе, чтобы срезать символы `CR`
This commit is contained in:
deexsed 2026-03-30 16:30:45 +03:00
parent da4b521aba
commit 7ad2f77165
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
docker/entrypoint.sh text eol=lf

4
Dockerfile
View File

@ -36,10 +36,12 @@ WORKDIR /app
COPY --from=builder /opt/venv /opt/venv COPY --from=builder /opt/venv /opt/venv
COPY proxy ./proxy COPY proxy ./proxy
COPY README.md LICENSE ./ COPY README.md LICENSE ./
COPY docker/entrypoint.sh ./docker/entrypoint.sh
RUN sed -i 's/\r$//' ./docker/entrypoint.sh && chmod +x ./docker/entrypoint.sh
USER app USER app
EXPOSE 1443/tcp EXPOSE 1443/tcp
ENTRYPOINT ["/usr/bin/tini", "--", "/bin/sh", "-lc", "set -eu; args=\"--host ${TG_WS_PROXY_HOST} --port ${TG_WS_PROXY_PORT}\"; for dc in ${TG_WS_PROXY_DC_IPS}; do args=\"$args --dc-ip $dc\"; done; exec python -u proxy/tg_ws_proxy.py $args \"$@\"", "--"] ENTRYPOINT ["/usr/bin/tini", "--", "/app/docker/entrypoint.sh"]
CMD [] CMD []

7
docker/entrypoint.sh Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
set -eu
args="--host ${TG_WS_PROXY_HOST} --port ${TG_WS_PROXY_PORT}"
for dc in ${TG_WS_PROXY_DC_IPS}; do
args="$args --dc-ip $dc"
done
exec python -u proxy/tg_ws_proxy.py $args "$@"