Revert Dockerfile user to $UID until next major release

Author: alessfg

Dockerfile-alpine-perl.template

@@ -73,4 +73,4 @@ RUN set -x \
     && if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
     && if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi
 
-USER nginx
+USER $UID

Dockerfile-alpine-slim.template

@@ -112,9 +112,9 @@ RUN sed -i 's,listen       80;,listen       8080;,' /etc/nginx/conf.d/default.co
     && sed -i 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf \
     && sed -i "/^http {/a \    proxy_temp_path /tmp/proxy_temp;\n    client_body_temp_path /tmp/client_temp;\n    fastcgi_temp_path /tmp/fastcgi_temp;\n    uwsgi_temp_path /tmp/uwsgi_temp;\n    scgi_temp_path /tmp/scgi_temp;\n" /etc/nginx/nginx.conf \
 # nginx user must own the cache and etc directory to write cache and tweak the nginx config
-    && chown -R nginx:0 /var/cache/nginx \
+    && chown -R $UID:0 /var/cache/nginx \
     && chmod -R g+w /var/cache/nginx \
-    && chown -R nginx:0 /etc/nginx \
+    && chown -R $UID:0 /etc/nginx \
     && chmod -R g+w /etc/nginx
 
 COPY docker-entrypoint.sh /
@@ -127,6 +127,6 @@ EXPOSE 8080
 
 STOPSIGNAL SIGQUIT
 
-USER nginx
+USER $UID
 
 CMD ["nginx", "-g", "daemon off;"]

Dockerfile-alpine.template

@@ -80,4 +80,4 @@ RUN set -x \
 # Bring in curl and ca-certificates to make registering on DNS SD easier
     && apk add --no-cache curl ca-certificates
 
-USER nginx
+USER $UID

Dockerfile-debian-perl.template

@@ -80,4 +80,4 @@ RUN set -x \
         && rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
     fi
 
-USER nginx
+USER $UID

Dockerfile-debian.template

@@ -101,9 +101,9 @@ RUN sed -i 's,listen       80;,listen       8080;,' /etc/nginx/conf.d/default.co
     && sed -i 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf \
     && sed -i "/^http {/a \    proxy_temp_path /tmp/proxy_temp;\n    client_body_temp_path /tmp/client_temp;\n    fastcgi_temp_path /tmp/fastcgi_temp;\n    uwsgi_temp_path /tmp/uwsgi_temp;\n    scgi_temp_path /tmp/scgi_temp;\n" /etc/nginx/nginx.conf \
 # nginx user must own the cache and etc directory to write cache and tweak the nginx config
-    && chown -R nginx:0 /var/cache/nginx \
+    && chown -R $UID:0 /var/cache/nginx \
     && chmod -R g+w /var/cache/nginx \
-    && chown -R nginx:0 /etc/nginx \
+    && chown -R $UID:0 /etc/nginx \
     && chmod -R g+w /etc/nginx
 
 COPY docker-entrypoint.sh /
@@ -116,6 +116,6 @@ EXPOSE 8080
 
 STOPSIGNAL SIGQUIT
 
-USER nginx
+USER $UID
 
 CMD ["nginx", "-g", "daemon off;"]

mainline/alpine-perl/Dockerfile

@@ -84,4 +84,4 @@ RUN set -x \
     && if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
     && if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi
 
-USER nginx
+USER $UID

mainline/alpine-slim/Dockerfile

@@ -118,9 +118,9 @@ RUN sed -i 's,listen       80;,listen       8080;,' /etc/nginx/conf.d/default.co
     && sed -i 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf \
     && sed -i "/^http {/a \    proxy_temp_path /tmp/proxy_temp;\n    client_body_temp_path /tmp/client_temp;\n    fastcgi_temp_path /tmp/fastcgi_temp;\n    uwsgi_temp_path /tmp/uwsgi_temp;\n    scgi_temp_path /tmp/scgi_temp;\n" /etc/nginx/nginx.conf \
 # nginx user must own the cache and etc directory to write cache and tweak the nginx config
-    && chown -R nginx:0 /var/cache/nginx \
+    && chown -R $UID:0 /var/cache/nginx \
     && chmod -R g+w /var/cache/nginx \
-    && chown -R nginx:0 /etc/nginx \
+    && chown -R $UID:0 /etc/nginx \
     && chmod -R g+w /etc/nginx
 
 COPY docker-entrypoint.sh /
@@ -133,6 +133,6 @@ EXPOSE 8080
 
 STOPSIGNAL SIGQUIT
 
-USER nginx
+USER $UID
 
 CMD ["nginx", "-g", "daemon off;"]

mainline/alpine/Dockerfile

@@ -90,4 +90,4 @@ RUN set -x \
 # Bring in curl and ca-certificates to make registering on DNS SD easier
     && apk add --no-cache curl ca-certificates
 
-USER nginx
+USER $UID

mainline/debian-perl/Dockerfile

@@ -91,4 +91,4 @@ RUN set -x \
         && rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
     fi
 
-USER nginx
+USER $UID

mainline/debian/Dockerfile

@@ -111,9 +111,9 @@ RUN sed -i 's,listen       80;,listen       8080;,' /etc/nginx/conf.d/default.co
     && sed -i 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf \
     && sed -i "/^http {/a \    proxy_temp_path /tmp/proxy_temp;\n    client_body_temp_path /tmp/client_temp;\n    fastcgi_temp_path /tmp/fastcgi_temp;\n    uwsgi_temp_path /tmp/uwsgi_temp;\n    scgi_temp_path /tmp/scgi_temp;\n" /etc/nginx/nginx.conf \
 # nginx user must own the cache and etc directory to write cache and tweak the nginx config
-    && chown -R nginx:0 /var/cache/nginx \
+    && chown -R $UID:0 /var/cache/nginx \
     && chmod -R g+w /var/cache/nginx \
-    && chown -R nginx:0 /etc/nginx \
+    && chown -R $UID:0 /etc/nginx \
     && chmod -R g+w /etc/nginx
 
 COPY docker-entrypoint.sh /
@@ -126,6 +126,6 @@ EXPOSE 8080
 
 STOPSIGNAL SIGQUIT
 
-USER nginx
+USER $UID
 
 CMD ["nginx", "-g", "daemon off;"]