Update Dockerfile
Browse files- Dockerfile +18 -18
Dockerfile
CHANGED
|
@@ -48,8 +48,6 @@ RUN mkdir -p /app /var/log/supervisor /tmp/supervisor /data && \
|
|
| 48 |
# 6. Supervisord config
|
| 49 |
RUN echo '[supervisord]' > /app/supervisord.conf \
|
| 50 |
&& echo 'nodaemon=true' >> /app/supervisord.conf \
|
| 51 |
-
&& echo 'logfile=/tmp/supervisor/supervisord.log' >> /app/supervisord.conf \
|
| 52 |
-
&& echo 'logfile_maxbytes=0' >> /app/supervisord.conf \
|
| 53 |
&& echo 'pidfile=/tmp/supervisor/supervisord.pid' >> /app/supervisord.conf \
|
| 54 |
&& echo 'user=user' >> /app/supervisord.conf \
|
| 55 |
&& echo '' >> /app/supervisord.conf \
|
|
@@ -61,10 +59,10 @@ RUN echo '[supervisord]' > /app/supervisord.conf \
|
|
| 61 |
&& echo 'autorestart=true' >> /app/supervisord.conf \
|
| 62 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 63 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 64 |
-
&& echo 'stdout_logfile=/
|
| 65 |
-
&& echo 'stdout_logfile_maxbytes=
|
| 66 |
-
&& echo 'stderr_logfile=/
|
| 67 |
-
&& echo 'stderr_logfile_maxbytes=
|
| 68 |
&& echo '' >> /app/supervisord.conf \
|
| 69 |
&& echo '[program:aiclient]' >> /app/supervisord.conf \
|
| 70 |
&& echo 'command=/usr/bin/node /app/aiclient2api/src/core/master.js' >> /app/supervisord.conf \
|
|
@@ -74,10 +72,10 @@ RUN echo '[supervisord]' > /app/supervisord.conf \
|
|
| 74 |
&& echo 'autorestart=true' >> /app/supervisord.conf \
|
| 75 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 76 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 77 |
-
&& echo 'stdout_logfile=/
|
| 78 |
-
&& echo 'stdout_logfile_maxbytes=
|
| 79 |
-
&& echo 'stderr_logfile=/
|
| 80 |
-
&& echo 'stderr_logfile_maxbytes=
|
| 81 |
&& echo '' >> /app/supervisord.conf \
|
| 82 |
&& echo '[program:kirogo]' >> /app/supervisord.conf \
|
| 83 |
&& echo 'command=/usr/local/bin/kiro-go' >> /app/supervisord.conf \
|
|
@@ -87,10 +85,10 @@ RUN echo '[supervisord]' > /app/supervisord.conf \
|
|
| 87 |
&& echo 'autorestart=true' >> /app/supervisord.conf \
|
| 88 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 89 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 90 |
-
&& echo 'stdout_logfile=/
|
| 91 |
-
&& echo 'stdout_logfile_maxbytes=
|
| 92 |
-
&& echo 'stderr_logfile=/
|
| 93 |
-
&& echo 'stderr_logfile_maxbytes=
|
| 94 |
&& echo '' >> /app/supervisord.conf \
|
| 95 |
&& echo '[program:zrok]' >> /app/supervisord.conf \
|
| 96 |
&& echo 'command=/app/start_zrok.sh' >> /app/supervisord.conf \
|
|
@@ -99,10 +97,10 @@ RUN echo '[supervisord]' > /app/supervisord.conf \
|
|
| 99 |
&& echo 'startsecs=2' >> /app/supervisord.conf \
|
| 100 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 101 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 102 |
-
&& echo 'stdout_logfile=/
|
| 103 |
-
&& echo 'stdout_logfile_maxbytes=
|
| 104 |
-
&& echo 'stderr_logfile=/
|
| 105 |
-
&& echo 'stderr_logfile_maxbytes=
|
| 106 |
|
| 107 |
# 7. Zrok startup script
|
| 108 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh \
|
|
@@ -171,6 +169,8 @@ RUN echo '#!/bin/bash' > /app/start.sh \
|
|
| 171 |
&& echo ' ln -s /data/kirogo /app/data' >> /app/start.sh \
|
| 172 |
&& echo 'fi' >> /app/start.sh \
|
| 173 |
&& echo '' >> /app/start.sh \
|
|
|
|
|
|
|
| 174 |
&& echo 'echo "[start] Starting supervisord..."' >> /app/start.sh \
|
| 175 |
&& echo 'exec supervisord -c /app/supervisord.conf' >> /app/start.sh
|
| 176 |
RUN chmod +x /app/start.sh
|
|
|
|
| 48 |
# 6. Supervisord config
|
| 49 |
RUN echo '[supervisord]' > /app/supervisord.conf \
|
| 50 |
&& echo 'nodaemon=true' >> /app/supervisord.conf \
|
|
|
|
|
|
|
| 51 |
&& echo 'pidfile=/tmp/supervisor/supervisord.pid' >> /app/supervisord.conf \
|
| 52 |
&& echo 'user=user' >> /app/supervisord.conf \
|
| 53 |
&& echo '' >> /app/supervisord.conf \
|
|
|
|
| 59 |
&& echo 'autorestart=true' >> /app/supervisord.conf \
|
| 60 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 61 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 62 |
+
&& echo 'stdout_logfile=/tmp/supervisor/newapi.stdout.log' >> /app/supervisord.conf \
|
| 63 |
+
&& echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
|
| 64 |
+
&& echo 'stderr_logfile=/tmp/supervisor/newapi.stderr.log' >> /app/supervisord.conf \
|
| 65 |
+
&& echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf \
|
| 66 |
&& echo '' >> /app/supervisord.conf \
|
| 67 |
&& echo '[program:aiclient]' >> /app/supervisord.conf \
|
| 68 |
&& echo 'command=/usr/bin/node /app/aiclient2api/src/core/master.js' >> /app/supervisord.conf \
|
|
|
|
| 72 |
&& echo 'autorestart=true' >> /app/supervisord.conf \
|
| 73 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 74 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 75 |
+
&& echo 'stdout_logfile=/tmp/supervisor/aiclient.stdout.log' >> /app/supervisord.conf \
|
| 76 |
+
&& echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
|
| 77 |
+
&& echo 'stderr_logfile=/tmp/supervisor/aiclient.stderr.log' >> /app/supervisord.conf \
|
| 78 |
+
&& echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf \
|
| 79 |
&& echo '' >> /app/supervisord.conf \
|
| 80 |
&& echo '[program:kirogo]' >> /app/supervisord.conf \
|
| 81 |
&& echo 'command=/usr/local/bin/kiro-go' >> /app/supervisord.conf \
|
|
|
|
| 85 |
&& echo 'autorestart=true' >> /app/supervisord.conf \
|
| 86 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 87 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 88 |
+
&& echo 'stdout_logfile=/tmp/supervisor/kirogo.stdout.log' >> /app/supervisord.conf \
|
| 89 |
+
&& echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
|
| 90 |
+
&& echo 'stderr_logfile=/tmp/supervisor/kirogo.stderr.log' >> /app/supervisord.conf \
|
| 91 |
+
&& echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf \
|
| 92 |
&& echo '' >> /app/supervisord.conf \
|
| 93 |
&& echo '[program:zrok]' >> /app/supervisord.conf \
|
| 94 |
&& echo 'command=/app/start_zrok.sh' >> /app/supervisord.conf \
|
|
|
|
| 97 |
&& echo 'startsecs=2' >> /app/supervisord.conf \
|
| 98 |
&& echo 'stopasgroup=true' >> /app/supervisord.conf \
|
| 99 |
&& echo 'killasgroup=true' >> /app/supervisord.conf \
|
| 100 |
+
&& echo 'stdout_logfile=/tmp/supervisor/zrok.stdout.log' >> /app/supervisord.conf \
|
| 101 |
+
&& echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
|
| 102 |
+
&& echo 'stderr_logfile=/tmp/supervisor/zrok.stderr.log' >> /app/supervisord.conf \
|
| 103 |
+
&& echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf
|
| 104 |
|
| 105 |
# 7. Zrok startup script
|
| 106 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh \
|
|
|
|
| 169 |
&& echo ' ln -s /data/kirogo /app/data' >> /app/start.sh \
|
| 170 |
&& echo 'fi' >> /app/start.sh \
|
| 171 |
&& echo '' >> /app/start.sh \
|
| 172 |
+
&& echo 'chmod 777 /tmp/supervisor' >> /app/start.sh \
|
| 173 |
+
&& echo '' >> /app/start.sh \
|
| 174 |
&& echo 'echo "[start] Starting supervisord..."' >> /app/start.sh \
|
| 175 |
&& echo 'exec supervisord -c /app/supervisord.conf' >> /app/start.sh
|
| 176 |
RUN chmod +x /app/start.sh
|