sft0farid commited on
Commit
1d79c6b
·
verified ·
1 Parent(s): 140b4c4

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +13 -12
Dockerfile CHANGED
@@ -95,19 +95,20 @@ 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" ] || [ -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
112
 
113
  # 8. Entrypoint
 
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" ] || [ -z "$ZROK_IDENTITY_B64" ]; then' >> /app/start_zrok.sh \
100
+ && echo ' echo "Required ZROK vars 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/identities"' >> /app/start_zrok.sh \
106
+ && echo 'ZROK_API="${ZROK_API_ENDPOINT:-https://api-v1.zrok.io}"' >> /app/start_zrok.sh \
 
107
  && 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 \
108
+ && echo 'echo "$ZROK_IDENTITY_B64" | base64 -d > "$HOME/.zrok/identities/environment.json"' >> /app/start_zrok.sh \
109
+ && echo 'printf "{\"v\":\"v0.4\"}" > "$HOME/.zrok/metadata.json"' >> /app/start_zrok.sh \
110
+ && echo 'echo "Starting zrok share reserved: $ZROK_SHARE_NAME"' >> /app/start_zrok.sh \
111
+ && echo 'exec zrok share reserved "$ZROK_SHARE_NAME" --headless' >> /app/start_zrok.sh \
112
  && chmod +x /app/start_zrok.sh
113
 
114
  # 8. Entrypoint