@@ -251,6 +251,7 @@ def _generate_prometheus_family_healthcheck(port: int) -> str:
251251 "LICENSE" ,
252252 "20-envsubst-on-templates.sh" ,
253253 "30-tune-worker-processes.sh" ,
254+ "40-unprivileged-mode.sh" ,
254255 "index.html" ,
255256):
256257 _NGINX_FILES [filename ] = (Path (__file__ ).parent / "nginx" / filename ).read_bytes ()
@@ -278,6 +279,8 @@ def _get_nginx_kwargs(os_version: OsVersion):
278279 "nginx" ,
279280 "findutils" ,
280281 _envsubst_pkg_name (os_version ),
282+ "sed" ,
283+ "grep" ,
281284 ]
282285 )
283286 + (["libcurl-mini4" ] if os_version .is_sl16 else []),
@@ -293,13 +296,14 @@ def _get_nginx_kwargs(os_version: OsVersion):
293296 ),
294297 "custom_end" : textwrap .dedent (f"""
295298 { DOCKERFILE_RUN } mkdir /docker-entrypoint.d
296- COPY [1-3 ]0-*.sh /docker-entrypoint.d/
299+ COPY [1-4 ]0-*.sh /docker-entrypoint.d/
297300 COPY docker-entrypoint.sh /usr/local/bin
298301 COPY index.html /srv/www/htdocs/
299302 { DOCKERFILE_RUN } chmod +x /docker-entrypoint.d/*.sh /usr/local/bin/docker-entrypoint.sh
300- { DOCKERFILE_RUN } install -d -o nginx -g nginx -m 750 /var/log/nginx; \
301- ln -sf /dev/stdout /var/log/nginx/access.log; \
302- ln -sf /dev/stderr /var/log/nginx/error.log
303+ { DOCKERFILE_RUN } set -euo pipefail; mkdir -p /var/cache/nginx /var/run/nginx /tmp/client_temp /tmp/proxy_temp /tmp/fastcgi_temp /tmp/uwsgi_temp /tmp/scgi_temp;\
304+ ln -sf /dev/stdout /var/log/nginx/access.log;\
305+ ln -sf /dev/stderr /var/log/nginx/error.log;\
306+ chmod -R 777 /var/cache/nginx /etc/nginx /var/run/nginx /var/log/nginx /tmp/client_temp /tmp/proxy_temp /tmp/fastcgi_temp /tmp/uwsgi_temp /tmp/scgi_temp;
303307 STOPSIGNAL SIGQUIT""" ),
304308 }
305309
0 commit comments