Update Dockerfile
Browse files- Dockerfile +5 -17
Dockerfile
CHANGED
|
@@ -95,29 +95,17 @@ 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 |
-
# 7. 小泻褉懈锌褌 zrok
|
| 99 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh \
|
| 100 |
-
&& echo 'if [ -z "$ZROK_TOKEN" ] || [ -z "$ZROK_SHARE_NAME" ]; then'
|
| 101 |
-
&& echo ' echo "ZROK_TOKEN or
|
| 102 |
&& echo ' sleep infinity' >> /app/start_zrok.sh \
|
| 103 |
&& echo ' exit 0' >> /app/start_zrok.sh \
|
| 104 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 105 |
&& echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
|
| 106 |
-
&& echo 'mkdir -p "$HOME"'
|
| 107 |
&& echo 'ZROK_API="${ZROK_API_ENDPOINT:-https://api-v1.zrok.io}"' >> /app/start_zrok.sh \
|
| 108 |
-
&& echo '
|
| 109 |
-
&& echo '
|
| 110 |
-
&& echo ' zrok config set apiEndpoint "$ZROK_API"' >> /app/start_zrok.sh \
|
| 111 |
-
&& echo ' echo "Enabling zrok environment..."' >> /app/start_zrok.sh \
|
| 112 |
-
&& echo ' zrok enable "$ZROK_TOKEN" --headless' >> /app/start_zrok.sh \
|
| 113 |
-
&& echo ' if [ $? -ne 0 ]; then' >> /app/start_zrok.sh \
|
| 114 |
-
&& echo ' echo "zrok enable failed"' >> /app/start_zrok.sh \
|
| 115 |
-
&& echo ' sleep infinity' >> /app/start_zrok.sh \
|
| 116 |
-
&& echo ' exit 1' >> /app/start_zrok.sh \
|
| 117 |
-
&& echo ' fi' >> /app/start_zrok.sh \
|
| 118 |
-
&& echo 'else' >> /app/start_zrok.sh \
|
| 119 |
-
&& echo ' echo "zrok already enabled, skipping enable"' >> /app/start_zrok.sh \
|
| 120 |
-
&& echo 'fi' >> /app/start_zrok.sh \
|
| 121 |
&& echo 'echo "Starting zrok share reserved: $ZROK_SHARE_NAME"' >> /app/start_zrok.sh \
|
| 122 |
&& echo 'exec zrok share reserved "$ZROK_SHARE_NAME" --headless' >> /app/start_zrok.sh \
|
| 123 |
&& chmod +x /app/start_zrok.sh
|
|
|
|
| 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" ] || [ -z "$ZROK_SHARE_NAME" ] || [ -z "$ZROK_ZITI_IDENTITY" ]; then' >> /app/start_zrok.sh \
|
| 100 |
+
&& echo ' echo "ZROK_TOKEN, ZROK_SHARE_NAME or ZROK_ZITI_IDENTITY not set, skipping zrok"' >> /app/start_zrok.sh \
|
| 101 |
&& echo ' sleep infinity' >> /app/start_zrok.sh \
|
| 102 |
&& echo ' exit 0' >> /app/start_zrok.sh \
|
| 103 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 104 |
&& echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
|
| 105 |
+
&& echo 'mkdir -p "$HOME/.zrok"' >> /app/start_zrok.sh \
|
| 106 |
&& echo 'ZROK_API="${ZROK_API_ENDPOINT:-https://api-v1.zrok.io}"' >> /app/start_zrok.sh \
|
| 107 |
+
&& echo 'echo "Writing zrok environment.json..."' >> /app/start_zrok.sh \
|
| 108 |
+
&& echo 'printf "{\"zrok_token\":\"%s\",\"ziti_identity\":\"%s\",\"api_endpoint\":\"%s\"}\n" "$ZROK_TOKEN" "$ZROK_ZITI_IDENTITY" "$ZROK_API" > "$HOME/.zrok/environment.json"' >> /app/start_zrok.sh \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 109 |
&& echo 'echo "Starting zrok share reserved: $ZROK_SHARE_NAME"' >> /app/start_zrok.sh \
|
| 110 |
&& echo 'exec zrok share reserved "$ZROK_SHARE_NAME" --headless' >> /app/start_zrok.sh \
|
| 111 |
&& chmod +x /app/start_zrok.sh
|