Update Dockerfile
Browse files- Dockerfile +8 -6
Dockerfile
CHANGED
|
@@ -241,7 +241,8 @@ RUN nginx -t && \
|
|
| 241 |
java -version
|
| 242 |
|
| 243 |
# 暴露端口7860和443(HTTPS)
|
| 244 |
-
EXPOSE 7860 8081
|
|
|
|
| 245 |
|
| 246 |
# 创建启动脚本
|
| 247 |
# RUN echo '#!/bin/sh' > /start.sh && \
|
|
@@ -289,13 +290,14 @@ RUN echo '#!/bin/sh' > /start.sh && \
|
|
| 289 |
echo ' sleep 2' >> /start.sh && \
|
| 290 |
echo 'done' >> /start.sh && \
|
| 291 |
echo '' >> /start.sh && \
|
| 292 |
-
echo 'echo "Starting nginx on port 7860..."' >> /start.sh && \
|
| 293 |
-
echo 'nginx -g "daemon on;" &' >> /start.sh && \
|
| 294 |
-
echo 'NGINX_PID=$!' >> /start.sh && \
|
| 295 |
-
echo 'echo "Nginx PID: $NGINX_PID"' >> /start.sh && \
|
| 296 |
echo '' >> /start.sh && \
|
| 297 |
echo '# 监控两个进程' >> /start.sh && \
|
| 298 |
-
echo 'trap "kill $JAVA_PID $NGINX_PID; exit" TERM INT' >> /start.sh && \
|
|
|
|
| 299 |
echo 'tail -f /app/app-run.log &' >> /start.sh && \
|
| 300 |
echo 'wait' >> /start.sh && \
|
| 301 |
chmod +x /start.sh
|
|
|
|
| 241 |
java -version
|
| 242 |
|
| 243 |
# 暴露端口7860和443(HTTPS)
|
| 244 |
+
# EXPOSE 7860 8081
|
| 245 |
+
EXPOSE 8081
|
| 246 |
|
| 247 |
# 创建启动脚本
|
| 248 |
# RUN echo '#!/bin/sh' > /start.sh && \
|
|
|
|
| 290 |
echo ' sleep 2' >> /start.sh && \
|
| 291 |
echo 'done' >> /start.sh && \
|
| 292 |
echo '' >> /start.sh && \
|
| 293 |
+
# echo 'echo "Starting nginx on port 7860..."' >> /start.sh && \
|
| 294 |
+
# echo 'nginx -g "daemon on;" &' >> /start.sh && \
|
| 295 |
+
# echo 'NGINX_PID=$!' >> /start.sh && \
|
| 296 |
+
# echo 'echo "Nginx PID: $NGINX_PID"' >> /start.sh && \
|
| 297 |
echo '' >> /start.sh && \
|
| 298 |
echo '# 监控两个进程' >> /start.sh && \
|
| 299 |
+
# echo 'trap "kill $JAVA_PID $NGINX_PID; exit" TERM INT' >> /start.sh && \
|
| 300 |
+
echo 'trap "kill $JAVA_PID; exit" TERM INT' >> /start.sh && \
|
| 301 |
echo 'tail -f /app/app-run.log &' >> /start.sh && \
|
| 302 |
echo 'wait' >> /start.sh && \
|
| 303 |
chmod +x /start.sh
|