Update Dockerfile
Browse files- Dockerfile +5 -4
Dockerfile
CHANGED
|
@@ -96,8 +96,9 @@ RUN cd /tmp && \
|
|
| 96 |
chown -R nginx:nginx /var/log/nginx
|
| 97 |
|
| 98 |
# 创建nginx配置文件(修改端口为7860)
|
| 99 |
-
|
| 100 |
-
|
|
|
|
| 101 |
echo 'error_log /var/log/nginx/error.log;' >> /etc/nginx/nginx.conf && \
|
| 102 |
echo 'pid /var/run/nginx.pid;' >> /etc/nginx/nginx.conf && \
|
| 103 |
echo '' >> /etc/nginx/nginx.conf && \
|
|
@@ -152,7 +153,7 @@ RUN mkdir -p /usr/share/nginx/html && \
|
|
| 152 |
java --version >> /usr/share/nginx/html/index.html && \
|
| 153 |
echo '</pre>' >> /usr/share/nginx/html/index.html && \
|
| 154 |
echo '<pre>' >> /usr/share/nginx/html/index.html && \
|
| 155 |
-
nginx -v
|
| 156 |
echo '</pre>' >> /usr/share/nginx/html/index.html && \
|
| 157 |
echo '</body>' >> /usr/share/nginx/html/index.html && \
|
| 158 |
echo '</html>' >> /usr/share/nginx/html/index.html
|
|
@@ -177,7 +178,7 @@ RUN echo '#!/bin/sh' > /start.sh && \
|
|
| 177 |
echo 'nginx -t' >> /start.sh && \
|
| 178 |
echo 'echo ""' >> /start.sh && \
|
| 179 |
echo 'echo "Starting nginx on port 7860..."' >> /start.sh && \
|
| 180 |
-
echo '
|
| 181 |
chmod +x /start.sh
|
| 182 |
|
| 183 |
# 设置工作目录
|
|
|
|
| 96 |
chown -R nginx:nginx /var/log/nginx
|
| 97 |
|
| 98 |
# 创建nginx配置文件(修改端口为7860)
|
| 99 |
+
# 屏蔽警告: nginx: [warn] the "user" directive makes sense only if the master process runs with super-user privileges, ignored in /etc/nginx/nginx.conf:1
|
| 100 |
+
# RUN echo 'user nginx;' > /etc/nginx/nginx.conf && \
|
| 101 |
+
RUN echo 'worker_processes auto;' >> /etc/nginx/nginx.conf && \
|
| 102 |
echo 'error_log /var/log/nginx/error.log;' >> /etc/nginx/nginx.conf && \
|
| 103 |
echo 'pid /var/run/nginx.pid;' >> /etc/nginx/nginx.conf && \
|
| 104 |
echo '' >> /etc/nginx/nginx.conf && \
|
|
|
|
| 153 |
java --version >> /usr/share/nginx/html/index.html && \
|
| 154 |
echo '</pre>' >> /usr/share/nginx/html/index.html && \
|
| 155 |
echo '<pre>' >> /usr/share/nginx/html/index.html && \
|
| 156 |
+
nginx -v >> /usr/share/nginx/html/index.html 2>&1 && \
|
| 157 |
echo '</pre>' >> /usr/share/nginx/html/index.html && \
|
| 158 |
echo '</body>' >> /usr/share/nginx/html/index.html && \
|
| 159 |
echo '</html>' >> /usr/share/nginx/html/index.html
|
|
|
|
| 178 |
echo 'nginx -t' >> /start.sh && \
|
| 179 |
echo 'echo ""' >> /start.sh && \
|
| 180 |
echo 'echo "Starting nginx on port 7860..."' >> /start.sh && \
|
| 181 |
+
echo 'nginx -g "daemon off;"' >> /start.sh && \
|
| 182 |
chmod +x /start.sh
|
| 183 |
|
| 184 |
# 设置工作目录
|