8000 Use chown(8) only once. · nginx/kubernetes-ingress@03e3e27 · GitHub
[go: up one dir, main page]
Skip to content

Commit 03e3e27

Browse files
osokinosokin
committed
Use chown(8) only once.
It's possible to pass multiple files to chown utility, so run it only once to make changes.
1 parent 4841668 commit 03e3e27

9 files changed

+28
-28
lines changed

‎build/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN mkdir -p /var/lib/nginx \
1616
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
1717
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
1818
&& chown -R nginx:0 /etc/nginx \
19-
&& chown -R nginx:0 /var/cache/nginx \
20-
&& chown -R nginx:0 /var/lib/nginx \
19+
/var/cache/nginx \
20+
/var/lib/nginx \
2121
&& apt-get remove --purge -y libcap2-bin \
2222
&& rm /etc/nginx/conf.d/* \
2323
&& rm -rf /var/lib/apt/lists/*

‎build/DockerfileForAlpine‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ RUN mkdir -p /etc/nginx/secrets \
1515
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
1616
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
1717
&& chown -R nginx:0 /etc/nginx \
18-
&& chown -R nginx:0 /var/cache/nginx \
19-
&& chown -R nginx:0 /var/lib/nginx \
18+
/var/cache/nginx \
19+
/var/lib/nginx \
2020
&& apk del libcap \
2121
&& rm /etc/nginx/conf.d/* \
2222
&& rm -rf /var/cache/apk/*

‎build/DockerfileForPlus‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ RUN mkdir -p /var/lib/nginx \
5555
&& mkdir -p /etc/nginx/secrets \
5656
&& mkdir -p /etc/nginx/stream-conf.d \
5757
&& chown -R nginx:0 /etc/nginx \
58-
&& chown -R nginx:0 /var/cache/nginx \
59-
&& chown -R nginx:0 /var/lib/nginx/ \
58+
/var/cache/nginx \
59+
/var/lib/nginx/ \
6060
&& apt-get remove --purge -y libcap2-bin \
6161
&& rm /etc/nginx/conf.d/*
6262

‎build/DockerfileWithOpentracing‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ RUN mkdir -p /var/lib/nginx \
8282
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
8383
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
8484
&& chown -R nginx:0 /etc/nginx \
85-
&& chown -R nginx:0 /var/cache/nginx \
86-
&& chown -R nginx:0 /var/lib/nginx \
85+
/var/cache/nginx \
86+
/var/lib/nginx \
8787
&& apt-get remove --purge -y libcap2-bin \
8888
&& rm /etc/nginx/conf.d/* \
8989
&& rm -rf /var/lib/apt/lists/*

‎build/DockerfileWithOpentracingForPlus‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ RUN mkdir -p /var/lib/nginx \
7171
&& mkdir -p /etc/nginx/secrets \
7272
&& mkdir -p /etc/nginx/stream-conf.d \
7373
&& chown -R nginx:0 /etc/nginx \
74-
&& chown -R nginx:0 /var/cache/nginx \
75-
&& chown -R nginx:0 /var/lib/nginx/ \
74+
/var/cache/nginx \
75+
/var/lib/nginx/ \
7676
&& apt-get remove --purge -y libcap2-bin \
7777
&& rm /etc/nginx/conf.d/*
7878

‎build/appprotect/DockerfileWithAppProtectForPlus‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ RUN mkdir -p /var/lib/nginx \
8383
&& mkdir -p /var/log/app_protect \
8484
&& mkdir -p /opt/app_protect \
8585
&& chown -R nginx:0 /etc/app_protect \
86-
&& chown -R nginx:0 /usr/share/ts \
87-
&& chown -R nginx:0 /etc/nginx \
88-
&& chown -R nginx:0 /var/cache/nginx \
89-
&& chown -R nginx:0 /var/lib/nginx/ \
90-
&& chown -R nginx:0 /var/log/app_protect/ \
91-
&& chown -R nginx:0 /opt/app_protect/ \
92-
&& chown -R nginx:0 /var/log/nginx/ \
86+
/usr/share/ts \
87+
/etc/nginx \
88+
/var/cache/nginx \
89+
/var/lib/nginx/ \
90+
/var/log/app_protect/ \
91+
/opt/app_protect/ \
92+
/var/log/nginx/ \
9393
&& apt-get remove --purge -y libcap2-bin \
9494
&& rm /etc/nginx/conf.d/*
9595

‎build/appprotect/DockerfileWithAppProtectForPlusForOpenShift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ RUN mkdir -p /var/lib/nginx \
8383
&& mkdir -p /var/log/app_protect \
8484
&& mkdir -p /opt/app_protect \
8585
&& chown -R nginx:0 /etc/app_protect \
86-
&& chown -R nginx:0 /usr/share/ts \
87-
&& chown -R nginx:0 /etc/nginx \
88-
&& chown -R nginx:0 /var/cache/nginx \
89-
&& chown -R nginx:0 /var/lib/nginx/ \
90-
&& chown -R nginx:0 /var/log/app_protect/ \
91-
&& chown -R nginx:0 /opt/app_protect/ \
92-
&& chown -R nginx:0 /var/log/nginx/ \
86+
/etc/nginx \
87+
/opt/app_protect/ \
88+
/usr/share/ts \
89+
/var/cache/nginx \
90+
/var/lib/nginx/ \
91+
/var/log/app_protect/ \
92+
/var/log/nginx/ \
9393
&& rm /etc/nginx/conf.d/*
9494

9595
RUN printf "MODULE = ALL;\nLOG_LEVEL = TS_CRIT;\nFILE = 2;\n" > /etc/app_protect/bd/logger.cfg \

‎build/openshift/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ RUN set -x \
2727
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
2828
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
2929
&& chown -R nginx:0 /etc/nginx \
30-
&& chown -R nginx:0 /var/cache/nginx \
31-
&& chown -R nginx:0 /var/lib/nginx \
30+
/var/cache/nginx \
31+
/var/lib/nginx \
3232
&& rm /etc/yum.repos.d/nginx.repo \
3333
&& rm /etc/nginx/conf.d/*
3434

‎build 6854 /openshift/DockerfileForPlus‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ RUN mkdir -p /var/lib/nginx \
6262
&& mkdir -p /etc/nginx/secrets \
6363
&& mkdir -p /etc/nginx/stream-conf.d \
6464
&& chown -R nginx:0 /etc/nginx \
65-
&& chown -R nginx:0 /var/cache/nginx \
66-
&& chown -R nginx:0 /var/lib/nginx/ \
65+
/var/cache/nginx \
66+
/var/lib/nginx/ \
6767
&& rm /etc/nginx/conf.d/*
6868

6969
EXPOSE 80 443

0 commit comments

Comments
 (0)
0