Hugging Face's logo

Spaces:
sft0farid
/
code
Paused

App Files Community
sft0farid commited on
Commit
e86c188
路
verified 路
1 Parent(s): a5dc27c

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +17 -8
Dockerfile CHANGED
@@ -95,6 +95,7 @@ RUN echo '[supervisord]'
95
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
96
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
97
 
 
98
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
99
  && echo 'if [ -z "$ZROK_TOKEN" ]; then' >> /app/start_zrok.sh \
100
  && echo ' echo "ZROK_TOKEN not set, skipping zrok"' >> /app/start_zrok.sh \
@@ -118,7 +119,7 @@ RUN echo '#!/bin/bash'
118
  && echo ' echo "Using existing reserved share: $SHARE_TOKEN"' >> /app/start_zrok.sh \
119
  && echo 'else' >> /app/start_zrok.sh \
120
  && echo ' echo "Creating new reserved share..."' >> /app/start_zrok.sh \
121
- && echo ' SHARE_TOKEN=$(zrok reserve public http://localhost:7860 2>&1 | grep "token is" | grep -oP "'"'"'[a-z0-9]+'"'"'" | tr -d "'"'"'")' >> /app/start_zrok.sh \
122
  && echo ' if [ -z "$SHARE_TOKEN" ]; then echo "Failed to create reserved share"; sleep infinity; exit 1; fi' >> /app/start_zrok.sh \
123
  && echo ' echo "$SHARE_TOKEN" > "$SHARE_FILE"' >> /app/start_zrok.sh \
124
  && echo ' echo "Reserved share created: $SHARE_TOKEN"' >> /app/start_zrok.sh \
@@ -127,14 +128,22 @@ RUN echo '#!/bin/bash'
127
  && echo 'echo "Starting zrok share reserved: $SHARE_TOKEN"' >> /app/start_zrok.sh \
128
  && echo 'exec zrok share reserved "$SHARE_TOKEN" --headless' >> /app/start_zrok.sh \
129
  && chmod +x /app/start_zrok.sh
130
-
131
  # 8. Entrypoint
132
- RUN echo '#!/bin/bash' > /app/start.sh \
133
- && echo 'if [ ! -L /app/aiclient2api/configs ]; then' >> /app/start.sh \
134
- && echo ' rm -rf /app/aiclient2api/configs' >> /app/start.sh \
135
- && echo ' ln -s /data/aiclient2api/configs /app/aiclient2api/configs' >> /app/start.sh \
136
- && echo 'fi' >> /app/start.sh \
137
- && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
 
 
 
 
 
 
 
 
138
  && chmod +x /app/start.sh
139
 
140
  EXPOSE 7860
 
95
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
96
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
97
 
98
+ # 7. 小泻褉懈锌褌 zrok
99
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
100
  && echo 'if [ -z "$ZROK_TOKEN" ]; then' >> /app/start_zrok.sh \
101
  && echo ' echo "ZROK_TOKEN not set, skipping zrok"' >> /app/start_zrok.sh \
 
119
  && echo ' echo "Using existing reserved share: $SHARE_TOKEN"' >> /app/start_zrok.sh \
120
  && echo 'else' >> /app/start_zrok.sh \
121
  && echo ' echo "Creating new reserved share..."' >> /app/start_zrok.sh \
122
+ && echo ' SHARE_TOKEN=$(zrok reserve public http://localhost:7860 2>/dev/null | grep -oP "token is '"'"'\K[a-z0-9]+")' >> /app/start_zrok.sh \
123
  && echo ' if [ -z "$SHARE_TOKEN" ]; then echo "Failed to create reserved share"; sleep infinity; exit 1; fi' >> /app/start_zrok.sh \
124
  && echo ' echo "$SHARE_TOKEN" > "$SHARE_FILE"' >> /app/start_zrok.sh \
125
  && echo ' echo "Reserved share created: $SHARE_TOKEN"' >> /app/start_zrok.sh \
 
128
  && echo 'echo "Starting zrok share reserved: $SHARE_TOKEN"' >> /app/start_zrok.sh \
129
  && echo 'exec zrok share reserved "$SHARE_TOKEN" --headless' >> /app/start_zrok.sh \
130
  && chmod +x /app/start_zrok.sh
131
+
132
  # 8. Entrypoint
133
+ RUN echo '#!/bin/bash' > /app/start.sh \
134
+ && echo 'if [ ! -L /app/aiclient2api/configs ]; then' >> /app/start.sh \
135
+ && echo ' rm -rf /app/aiclient2api/configs' >> /app/start.sh \
136
+ && echo ' ln -s /data/aiclient2api/configs /app/aiclient2api/configs' >> /app/start.sh \
137
+ && echo 'fi' >> /app/start.sh \
138
+ && echo 'SHARE_FILE="/data/zrok-home/.zrok/reserved_share"' >> /app/start.sh \
139
+ && echo 'if [ -f "$SHARE_FILE" ]; then' >> /app/start.sh \
140
+ && echo ' TOKEN=$(cat "$SHARE_FILE")' >> /app/start.sh \
141
+ && echo ' if ! echo "$TOKEN" | grep -qP "^[a-z0-9]{12}$"; then' >> /app/start.sh \
142
+ && echo ' echo "Removing corrupt reserved_share file"' >> /app/start.sh \
143
+ && echo ' rm -f "$SHARE_FILE"' >> /app/start.sh \
144
+ && echo ' fi' >> /app/start.sh \
145
+ && echo 'fi' >> /app/start.sh \
146
+ && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
147
  && chmod +x /app/start.sh
148
 
149
  EXPOSE 7860