diff --git a/build/Dockerfile b/build/Dockerfile index 2c3d7b9e78..e763ce7caf 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -9,8 +9,8 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \ && ln -sf /proc/1/fd/2 /var/log/nginx/error.log RUN mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/stream-conf.d \ && apt-get update \ && apt-get install -y libcap2-bin \ && setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \ diff --git a/build/DockerfileForAlpine b/build/DockerfileForAlpine index caa2d2d5ed..92c8d2d8e9 100644 --- a/build/DockerfileForAlpine +++ b/build/DockerfileForAlpine @@ -9,8 +9,8 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \ && ln -sf /proc/1/fd/2 /var/log/nginx/error.log RUN mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/stream-conf.d \ - && mkdir -p /var/lib/nginx \ + /etc/nginx/stream-conf.d \ + /var/lib/nginx \ && apk add --no-cache libcap \ && setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \ 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \ diff --git a/build/DockerfileForPlus b/build/DockerfileForPlus index 38fe8407d7..bff412b0ca 100644 --- a/build/DockerfileForPlus +++ b/build/DockerfileForPlus @@ -52,8 +52,8 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \ && ln -sf /proc/1/fd/2 /var/log/nginx/error.log RUN mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/stream-conf.d \ && chown -R nginx:0 /etc/nginx \ /var/cache/nginx \ /var/lib/nginx/ \ diff --git a/build/DockerfileWithOpentracing b/build/DockerfileWithOpentracing index 48369b3754..c8fa51d7de 100644 --- a/build/DockerfileWithOpentracing +++ b/build/DockerfileWithOpentracing @@ -75,8 +75,8 @@ COPY --from=tracer-downloader /usr/local/lib/libjaegertracing_plugin.so /usr/loc RUN ldconfig RUN mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/stream-conf.d \ && apt-get update \ && apt-get install -y libcap2-bin \ && setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \ diff --git a/build/DockerfileWithOpentracingForPlus b/build/DockerfileWithOpentracingForPlus index 1dd76ac166..4c4202d128 100644 --- a/build/DockerfileWithOpentracingForPlus +++ b/build/DockerfileWithOpentracingForPlus @@ -68,8 +68,8 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \ COPY --from=tracer-downloader /usr/local/lib/libjaegertracing_plugin.so /usr/local/lib/libjaegertracing_plugin.so RUN mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/stream-conf.d \ && chown -R nginx:0 /etc/nginx \ /var/cache/nginx \ /var/lib/nginx/ \ diff --git a/build/appprotect/DockerfileWithAppProtectForPlus b/build/appprotect/DockerfileWithAppProtectForPlus index 1fbf83a93d..7a74e967ff 100644 --- a/build/appprotect/DockerfileWithAppProtectForPlus +++ b/build/appprotect/DockerfileWithAppProtectForPlus @@ -75,13 +75,13 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \ && ln -sf /proc/1/fd/2 /var/log/nginx/error.log RUN mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/stream-conf.d \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/waf \ - && mkdir -p /etc/nginx/waf/nac-policies \ - && mkdir -p /etc/nginx/waf/nac-logconfs \ - && mkdir -p /var/log/app_protect \ - && mkdir -p /opt/app_protect \ + /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/waf \ + /etc/nginx/waf/nac-policies \ + /etc/nginx/waf/nac-logconfs \ + /var/log/app_protect \ + /opt/app_protect \ && chown -R nginx:0 /etc/app_protect \ /usr/share/ts \ /etc/nginx \ diff --git a/build/appprotect/DockerfileWithAppProtectForPlusForOpenShift b/build/appprotect/DockerfileWithAppProtectForPlusForOpenShift index 582b9f5b97..b28c2ba8f2 100644 --- a/build/appprotect/DockerfileWithAppProtectForPlusForOpenShift +++ b/build/appprotect/DockerfileWithAppProtectForPlusForOpenShift @@ -75,13 +75,13 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \ && ln -sf /proc/1/fd/2 /var/log/nginx/error.log RUN mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/stream-conf.d \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/waf \ - && mkdir -p /etc/nginx/waf/nac-policies \ - && mkdir -p /etc/nginx/waf/nac-logconfs \ - && mkdir -p /var/log/app_protect \ - && mkdir -p /opt/app_protect \ + /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/waf \ + /etc/nginx/waf/nac-policies \ + /etc/nginx/waf/nac-logconfs \ + /var/log/app_protect \ + /opt/app_protect \ && chown -R nginx:0 /etc/app_protect \ /usr/share/ts \ /etc/nginx \ diff --git a/build/openshift/Dockerfile b/build/openshift/Dockerfile index 322504cc08..e8ec729ee1 100644 --- a/build/openshift/Dockerfile +++ b/build/openshift/Dockerfile @@ -22,8 +22,8 @@ RUN set -x \ && echo "module_hotfixes=true" >> /etc/yum.repos.d/nginx.repo \ && yum install -y nginx-${NGINX_VERSION} \ && mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/stream-conf.d \ && setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \ 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \ && chown -R nginx:0 /etc/nginx \ diff --git a/build/openshift/DockerfileForPlus b/build/openshift/DockerfileForPlus index 8fe28ae7fd..3d2322fd98 100644 --- a/build/openshift/DockerfileForPlus +++ b/build/openshift/DockerfileForPlus @@ -59,8 +59,8 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \ && ln -sf /proc/1/fd/2 /var/log/nginx/error.log RUN mkdir -p /var/lib/nginx \ - && mkdir -p /etc/nginx/secrets \ - && mkdir -p /etc/nginx/stream-conf.d \ + /etc/nginx/secrets \ + /etc/nginx/stream-conf.d \ && chown -R nginx:0 /etc/nginx \ /var/cache/nginx \ /var/lib/nginx/ \