Hugging Face's logo

Spaces:
sft0farid
/
code
Paused

App Files Community
sft0farid commited on
Commit
02195c2
·
verified ·
1 Parent(s): 63289ae

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +46 -39
Dockerfile CHANGED
@@ -4,7 +4,6 @@ FROM calciumion/new-api:latest AS newapi-source
4
  FROM justlikemaki/aiclient-2-api:latest AS aiclient-source
5
  FROM ghcr.io/quorinex/kiro-go:latest AS kirogo-source
6
 
7
- # ─────────────────────────────────────────────
8
  FROM python:3.11-slim
9
 
10
  # 1. Системные зависимости + Node.js
@@ -13,17 +12,22 @@ RUN apt-get update && apt-get install -y curl gnupg supervisor \
13
  && apt-get install -y nodejs \
14
  && rm -rf /var/lib/apt/lists/*
15
 
16
- # 2. zrok v1.1.11
17
  RUN ARCH=$(dpkg --print-architecture) \
18
  && case "$ARCH" in \
19
  amd64) GOARCH=amd64 ;; \
20
  arm64) GOARCH=arm64 ;; \
21
  *) echo "Unsupported arch: $ARCH"; exit 1 ;; \
22
  esac \
23
- && curl -sSfL "https://github.com/openziti/zrok/releases/download/v1.1.11/zrok_1.1.11_linux_${GOARCH}.tar.gz" \
 
 
 
 
24
  | tar -xz -C /tmp \
25
- && install -o root -g root /tmp/zrok /usr/local/bin/zrok \
26
- && chmod +x /usr/local/bin/zrok
 
27
 
28
  # 3. Копируем из готовых образов
29
  COPY --from=newapi-source /new-api /usr/local/bin/new-api
@@ -36,6 +40,7 @@ RUN useradd -m -u 1000 user
36
 
37
  # 5. Директории
38
  RUN mkdir -p \
 
39
  /data/kirogo \
40
  /data/newapi \
41
  /data/zrok-home \
@@ -75,7 +80,6 @@ RUN echo '[supervisord]'
75
  && echo '' >> /data/supervisor/conf.d/supervisord.conf \
76
  && echo '[program:kirogo]' >> /data/supervisor/conf.d/supervisord.conf \
77
  && echo 'command=kiro-go' >> /data/supervisor/conf.d/supervisord.conf \
78
- && echo 'environment=PORT=8082' >> /data/supervisor/conf.d/supervisord.conf \
79
  && echo 'directory=/data/kirogo' >> /data/supervisor/conf.d/supervisord.conf \
80
  && echo 'autostart=true' >> /data/supervisor/conf.d/supervisord.conf \
81
  && echo 'autorestart=true' >> /data/supervisor/conf.d/supervisord.conf \
@@ -93,57 +97,60 @@ RUN echo '[supervisord]'
93
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
94
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
95
 
96
- # 7. Скрипт zrok v1 с retry loop
 
 
 
97
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
98
- && echo 'if [ -z "$ZROK_TOKEN" ]; then' >> /app/start_zrok.sh \
99
- && echo ' echo "[zrok] ZROK_TOKEN not set, skipping"' >> /app/start_zrok.sh \
100
  && echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
101
  && echo 'fi' >> /app/start_zrok.sh \
102
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
103
- && echo 'export ZROK_API_ENDPOINT=https://api.zrok.io' >> /app/start_zrok.sh \
104
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
105
- && echo 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
106
- && echo 'sleep 20' >> /app/start_zrok.sh \
107
- && echo 'if [ ! -f "$HOME/.zrok/environment.json" ]; then' >> /app/start_zrok.sh \
108
- && echo ' echo "[zrok] Enabling zrok environment..."' >> /app/start_zrok.sh \
109
- && echo ' zrok enable "$ZROK_TOKEN" --headless' >> /app/start_zrok.sh \
110
  && echo ' if [ $? -ne 0 ]; then' >> /app/start_zrok.sh \
111
- && echo ' echo "[zrok] enable failed, sleeping forever"' >> /app/start_zrok.sh \
112
- && echo ' sleep infinity' >> /app/start_zrok.sh \
113
  && echo ' fi' >> /app/start_zrok.sh \
114
  && echo 'else' >> /app/start_zrok.sh \
115
- && echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
116
  && echo 'fi' >> /app/start_zrok.sh \
117
- && echo 'if [ -n "$ZROK_SHARE_TOKEN" ]; then' >> /app/start_zrok.sh \
118
- && echo ' SHARE_NAME="$ZROK_SHARE_TOKEN"' >> /app/start_zrok.sh \
119
- && echo ' echo "[zrok] Using share token from env: $SHARE_NAME"' >> /app/start_zrok.sh \
120
- && echo ' zrok reserve public http://localhost:7860 --unique-name "$SHARE_NAME" 2>/dev/null || true' >> /app/start_zrok.sh \
121
- && echo 'elif [ -f "$SHARE_NAME_FILE" ]; then' >> /app/start_zrok.sh \
122
- && echo ' SHARE_NAME=$(cat "$SHARE_NAME_FILE")' >> /app/start_zrok.sh \
123
- && echo ' echo "[zrok] Using saved share token: $SHARE_NAME"' >> /app/start_zrok.sh \
 
124
  && echo 'else' >> /app/start_zrok.sh \
125
- && echo ' echo "[zrok] Creating new reserved share..."' >> /app/start_zrok.sh \
126
- && echo ' RESERVE_OUT=$(zrok reserve public http://localhost:7860 2>&1)' >> /app/start_zrok.sh \
127
- && echo ' echo "$RESERVE_OUT"' >> /app/start_zrok.sh \
128
- && echo ' SHARE_NAME=$(echo "$RESERVE_OUT" | grep -oE "your reserved share token is '"'"'[a-z0-9]+'"'"'" | grep -oE "[a-z0-9]+$")' >> /app/start_zrok.sh \
129
- && echo ' if [ -z "$SHARE_NAME" ]; then' >> /app/start_zrok.sh \
130
- && echo ' echo "[zrok] Failed to parse share token, sleeping forever"' >> /app/start_zrok.sh \
131
- && echo ' sleep infinity' >> /app/start_zrok.sh \
132
- && echo ' fi' >> /app/start_zrok.sh \
133
- && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
134
- && echo ' echo "[zrok] Reserved share created: $SHARE_NAME"' >> /app/start_zrok.sh \
135
  && echo 'fi' >> /app/start_zrok.sh \
 
 
 
 
136
  && echo 'echo "[zrok] URL: https://${SHARE_NAME}.share.zrok.io"' >> /app/start_zrok.sh \
 
137
  && echo 'while true; do' >> /app/start_zrok.sh \
138
- && echo ' echo "[zrok] Starting share reserved: $SHARE_NAME"' >> /app/start_zrok.sh \
139
- && echo ' zrok share reserved "$SHARE_NAME" --headless' >> /app/start_zrok.sh \
140
- && echo ' echo "[zrok] Share exited, retrying in 30s..."' >> /app/start_zrok.sh \
141
- && echo ' sleep 30' >> /app/start_zrok.sh \
142
  && echo 'done' >> /app/start_zrok.sh \
143
  && chmod +x /app/start_zrok.sh
144
 
145
  # 8. Entrypoint
146
  RUN echo '#!/bin/bash' > /app/start.sh \
 
 
 
 
 
147
  && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
148
  && chmod +x /app/start.sh
149
 
 
4
  FROM justlikemaki/aiclient-2-api:latest AS aiclient-source
5
  FROM ghcr.io/quorinex/kiro-go:latest AS kirogo-source
6
 
 
7
  FROM python:3.11-slim
8
 
9
  # 1. Системные зависимости + Node.js
 
12
  && apt-get install -y nodejs \
13
  && rm -rf /var/lib/apt/lists/*
14
 
15
+ # 2. zrok2 latest
16
  RUN ARCH=$(dpkg --print-architecture) \
17
  && case "$ARCH" in \
18
  amd64) GOARCH=amd64 ;; \
19
  arm64) GOARCH=arm64 ;; \
20
  *) echo "Unsupported arch: $ARCH"; exit 1 ;; \
21
  esac \
22
+ && VERSION=$(curl -sSf https://api.github.com/repos/openziti/zrok/releases/latest \
23
+ | grep '"tag_name"' | cut -d'"' -f4) \
24
+ && echo "Installing zrok ${VERSION} ${GOARCH}" \
25
+ && curl -sSfL \
26
+ "https://github.com/openziti/zrok/releases/download/${VERSION}/zrok_${VERSION#v}_linux_${GOARCH}.tar.gz" \
27
  | tar -xz -C /tmp \
28
+ && (install /tmp/zrok2 /usr/local/bin/zrok2 2>/dev/null \
29
+ || install /tmp/zrok /usr/local/bin/zrok2) \
30
+ && chmod +x /usr/local/bin/zrok2
31
 
32
  # 3. Копируем из готовых образов
33
  COPY --from=newapi-source /new-api /usr/local/bin/new-api
 
40
 
41
  # 5. Директории
42
  RUN mkdir -p \
43
+ /data/aiclient2api/configs \
44
  /data/kirogo \
45
  /data/newapi \
46
  /data/zrok-home \
 
80
  && echo '' >> /data/supervisor/conf.d/supervisord.conf \
81
  && echo '[program:kirogo]' >> /data/supervisor/conf.d/supervisord.conf \
82
  && echo 'command=kiro-go' >> /data/supervisor/conf.d/supervisord.conf \
 
83
  && echo 'directory=/data/kirogo' >> /data/supervisor/conf.d/supervisord.conf \
84
  && echo 'autostart=true' >> /data/supervisor/conf.d/supervisord.conf \
85
  && echo 'autorestart=true' >> /data/supervisor/conf.d/supervisord.conf \
 
97
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
98
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
99
 
100
+ # 7. Скрипт zrok2
101
+ # Нужные секреты: ZROK2_TOKEN (обязательный), ZROK2_SHARE_NAME (опциональный)
102
+ # Для кастомного инстанса: ZROK2_API_ENDPOINT
103
+ # URL будет: https://<ZROK2_SHARE_NAME>.share.zrok.io
104
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
105
+ && echo 'if [ -z "$ZROK2_TOKEN" ]; then' >> /app/start_zrok.sh \
106
+ && echo ' echo "[zrok] ZROK2_TOKEN not set, skipping"' >> /app/start_zrok.sh \
107
  && echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
108
  && echo 'fi' >> /app/start_zrok.sh \
109
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
 
110
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
111
+ && echo '# Включаем environment если ещё нет' >> /app/start_zrok.sh \
112
+ && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
113
+ && echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
114
+ && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
 
115
  && echo ' if [ $? -ne 0 ]; then' >> /app/start_zrok.sh \
116
+ && echo ' echo "[zrok] enable failed, sleeping"; sleep infinity; exit 1' >> /app/start_zrok.sh \
 
117
  && echo ' fi' >> /app/start_zrok.sh \
118
  && echo 'else' >> /app/start_zrok.sh \
119
+ && echo ' echo "[zrok] Environment already enabled"' >> /app/start_zrok.sh \
120
  && echo 'fi' >> /app/start_zrok.sh \
121
+ && echo '# Определяем имя шейра' >> /app/start_zrok.sh \
122
+ && echo 'NAME_FILE="$HOME/.zrok2/share_name"' >> /app/start_zrok.sh \
123
+ && echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
124
+ && echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
125
+ && echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
126
+ && echo 'elif [ -f "$NAME_FILE" ]; then' >> /app/start_zrok.sh \
127
+ && echo ' SHARE_NAME=$(cat "$NAME_FILE")' >> /app/start_zrok.sh \
128
+ && echo ' echo "[zrok] Using saved share name: $SHARE_NAME"' >> /app/start_zrok.sh \
129
  && echo 'else' >> /app/start_zrok.sh \
130
+ && echo ' SHARE_NAME=$(cat /proc/sys/kernel/random/uuid | tr -d - | head -c 12)' >> /app/start_zrok.sh \
131
+ && echo ' echo "[zrok] Generated share name: $SHARE_NAME"' >> /app/start_zrok.sh \
 
 
 
 
 
 
 
 
132
  && echo 'fi' >> /app/start_zrok.sh \
133
+ && echo '# Создаём имя в namespace (идемпотентно)' >> /app/start_zrok.sh \
134
+ && echo 'echo "[zrok] Reserving name public:${SHARE_NAME}..."' >> /app/start_zrok.sh \
135
+ && echo 'zrok2 create name -n public "$SHARE_NAME" 2>&1 || true' >> /app/start_zrok.sh \
136
+ && echo 'echo "$SHARE_NAME" > "$NAME_FILE"' >> /app/start_zrok.sh \
137
  && echo 'echo "[zrok] URL: https://${SHARE_NAME}.share.zrok.io"' >> /app/start_zrok.sh \
138
+ && echo '# Шейр с retry loop' >> /app/start_zrok.sh \
139
  && echo 'while true; do' >> /app/start_zrok.sh \
140
+ && echo ' echo "[zrok] Starting share..."' >> /app/start_zrok.sh \
141
+ && echo ' zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
142
+ && echo ' echo "[zrok] Share exited, retrying in 15s..."' >> /app/start_zrok.sh \
143
+ && echo ' sleep 15' >> /app/start_zrok.sh \
144
  && echo 'done' >> /app/start_zrok.sh \
145
  && chmod +x /app/start_zrok.sh
146
 
147
  # 8. Entrypoint
148
  RUN echo '#!/bin/bash' > /app/start.sh \
149
+ && echo '# Симлинк конфигов aiclient2api на персистентный том' >> /app/start.sh \
150
+ && echo 'if [ ! -L /app/aiclient2api/configs ]; then' >> /app/start.sh \
151
+ && echo ' rm -rf /app/aiclient2api/configs' >> /app/start.sh \
152
+ && echo ' ln -s /data/aiclient2api/configs /app/aiclient2api/configs' >> /app/start.sh \
153
+ && echo 'fi' >> /app/start.sh \
154
  && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
155
  && chmod +x /app/start.sh
156