Merge remote changes with local development
This commit is contained in:
1
.cloudflared/a765a217-5312-48f8-9bb7-5a7ef56602b8.json
Executable file
1
.cloudflared/a765a217-5312-48f8-9bb7-5a7ef56602b8.json
Executable file
@@ -0,0 +1 @@
|
|||||||
|
{"AccountTag":"a67861072a144cdd746e9c9bdd8476fe","TunnelSecret":"NCu/3BUoqAbF5kwXfs3rTjU9QUiVvXv7OM27BrUd/50Kf/wthq2rIH0G+Eu76LK8JQon/UQBUbQPoRPRY3qbtA==","TunnelID":"a765a217-5312-48f8-9bb7-5a7ef56602b8"}
|
||||||
7
.cloudflared/config.yml
Normal file
7
.cloudflared/config.yml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
tunnel: a765a217-5312-48f8-9bb7-5a7ef56602b8
|
||||||
|
credentials-file: /etc/cloudflared/a765a217-5312-48f8-9bb7-5a7ef56602b8.json
|
||||||
|
|
||||||
|
ingress:
|
||||||
|
- hostname: hb3-accelerator.com
|
||||||
|
service: http://dapp-frontend:5173
|
||||||
|
- service: http_status:404
|
||||||
9
Dockerfile.cloudflared
Normal file
9
Dockerfile.cloudflared
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
FROM alpine:3.20 as base
|
||||||
|
RUN apk add --no-cache bash curl wget
|
||||||
|
|
||||||
|
FROM cloudflare/cloudflared:2025.6.1 as src
|
||||||
|
|
||||||
|
FROM base
|
||||||
|
COPY --from=src /usr/local/bin/cloudflared /usr/local/bin/cloudflared
|
||||||
|
USER nobody
|
||||||
|
ENTRYPOINT ["bash", "/start-cloudflared.sh"]
|
||||||
9650
backend/logs/combined.log
Normal file
9650
backend/logs/combined.log
Normal file
File diff suppressed because it is too large
Load Diff
1754
backend/logs/error.log
Normal file
1754
backend/logs/error.log
Normal file
File diff suppressed because it is too large
Load Diff
BIN
cloudflared-linux-amd64.deb
Normal file
BIN
cloudflared-linux-amd64.deb
Normal file
Binary file not shown.
84
start-cloudflared.sh
Executable file
84
start-cloudflared.sh
Executable file
@@ -0,0 +1,84 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo "==== Содержимое /cloudflared.env ===="
|
||||||
|
cat /cloudflared.env || echo "Файл не найден"
|
||||||
|
echo "===="
|
||||||
|
|
||||||
|
# Получаем токен из переменной окружения или из файла
|
||||||
|
if [ -z "$TUNNEL_TOKEN" ] && [ -f /cloudflared.env ]; then
|
||||||
|
. /cloudflared.env
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "TUNNEL_TOKEN=[$TUNNEL_TOKEN]"
|
||||||
|
|
||||||
|
# Функция для проверки сети
|
||||||
|
check_network() {
|
||||||
|
echo "Проверка сетевого соединения..."
|
||||||
|
for addr in 1.1.1.1 8.8.8.8; do
|
||||||
|
if ping -c 1 -W 5 "$addr" > /dev/null 2>&1; then
|
||||||
|
echo "✓ Сеть доступна ($addr)"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo "✗ Сетевые проблемы"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Функция для проверки доступности backend
|
||||||
|
check_backend() {
|
||||||
|
echo "Проверка доступности backend..."
|
||||||
|
if curl -s --connect-timeout 5 http://backend:8000 >/dev/null 2>&1; then
|
||||||
|
echo "✓ Backend доступен"
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
echo "✗ Backend недоступен"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Проверяем сеть перед запуском
|
||||||
|
echo "=== Проверка подключений ==="
|
||||||
|
check_network
|
||||||
|
check_backend
|
||||||
|
|
||||||
|
# Проверяем наличие конфигурационного файла
|
||||||
|
echo "=== Проверка конфигурации ==="
|
||||||
|
if [ -f "/etc/cloudflared/config.yml" ]; then
|
||||||
|
echo "✓ Конфигурационный файл найден"
|
||||||
|
cat /etc/cloudflared/config.yml
|
||||||
|
else
|
||||||
|
echo "✗ Конфигурационный файл не найден"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "/etc/cloudflared/a765a217-5312-48f8-9bb7-5a7ef56602b8.json" ]; then
|
||||||
|
echo "✓ Credentials файл найден"
|
||||||
|
else
|
||||||
|
echo "✗ Credentials файл не найден"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Проверим доступность frontend
|
||||||
|
echo "=== Проверка frontend ==="
|
||||||
|
if curl -s --connect-timeout 5 http://dapp-frontend:5173 >/dev/null 2>&1; then
|
||||||
|
echo "✓ Frontend доступен"
|
||||||
|
else
|
||||||
|
echo "✗ Frontend недоступен, fallback на backend"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Запускаем cloudflared с токеном вместо конфигурационного файла
|
||||||
|
echo "=== Запуск cloudflared с токеном ==="
|
||||||
|
echo "Используем токен туннеля: ${TUNNEL_TOKEN:0:20}..."
|
||||||
|
exec cloudflared tunnel \
|
||||||
|
--no-autoupdate \
|
||||||
|
--edge-ip-version 4 \
|
||||||
|
--protocol http2 \
|
||||||
|
--retries 20 \
|
||||||
|
--grace-period 60s \
|
||||||
|
--loglevel info \
|
||||||
|
--metrics 0.0.0.0:39693 \
|
||||||
|
--proxy-connect-timeout 90s \
|
||||||
|
--proxy-tls-timeout 90s \
|
||||||
|
--proxy-tcp-keepalive 15s \
|
||||||
|
--proxy-keepalive-timeout 120s \
|
||||||
|
--proxy-keepalive-connections 10 \
|
||||||
|
--proxy-no-happy-eyeballs \
|
||||||
|
run --token "$TUNNEL_TOKEN"
|
||||||
Reference in New Issue
Block a user