From 49c22253e8cd2851a890ec68dc66647b83935eb2 Mon Sep 17 00:00:00 2001 From: Ricard Bejarano Date: Wed, 29 May 2019 22:22:39 +0200 Subject: [PATCH] rolled back problematic commit changes --- glibc/Dockerfile | 5 ++--- musl/Dockerfile | 5 ++--- rootfs/etc/group | 0 rootfs/etc/nginx/html/50x.html | 0 rootfs/etc/nginx/html/index.html | 0 rootfs/etc/nginx/mime.types | 0 rootfs/etc/nginx/nginx.conf | 0 rootfs/etc/passwd | 0 rootfs/tmp/.keep | 0 9 files changed, 4 insertions(+), 6 deletions(-) mode change 100644 => 100755 rootfs/etc/group mode change 100644 => 100755 rootfs/etc/nginx/html/50x.html mode change 100644 => 100755 rootfs/etc/nginx/html/index.html mode change 100644 => 100755 rootfs/etc/nginx/mime.types mode change 100644 => 100755 rootfs/etc/nginx/nginx.conf mode change 100644 => 100755 rootfs/etc/passwd mode change 100644 => 100755 rootfs/tmp/.keep diff --git a/glibc/Dockerfile b/glibc/Dockerfile index 25717f9..d8e45e6 100644 --- a/glibc/Dockerfile +++ b/glibc/Dockerfile @@ -17,8 +17,8 @@ ARG NGINX_CONFIG="\ --sbin-path=/nginx \ --conf-path=/etc/nginx/nginx.conf \ --pid-path=/tmp/nginx.pid \ - --http-log-path=/dev/stdout \ - --error-log-path=/dev/stdout \ + --http-log-path=/dev/null \ + --error-log-path=/dev/null \ --http-client-body-temp-path=/tmp/client_temp \ --http-proxy-temp-path=/tmp/proxy_temp \ --http-fastcgi-temp-path=/tmp/fastcgi_temp \ @@ -74,7 +74,6 @@ COPY --from=build /tmp/nginx/objs/nginx /nginx COPY rootfs / -USER nginx:nginx WORKDIR / EXPOSE 80/tcp STOPSIGNAL SIGTERM diff --git a/musl/Dockerfile b/musl/Dockerfile index c2b05e8..e82f33a 100644 --- a/musl/Dockerfile +++ b/musl/Dockerfile @@ -17,8 +17,8 @@ ARG NGINX_CONFIG="\ --sbin-path=/nginx \ --conf-path=/etc/nginx/nginx.conf \ --pid-path=/tmp/nginx.pid \ - --http-log-path=/dev/stdout \ - --error-log-path=/dev/stdout \ + --http-log-path=/dev/null \ + --error-log-path=/dev/null \ --http-client-body-temp-path=/tmp/client_temp \ --http-proxy-temp-path=/tmp/proxy_temp \ --http-fastcgi-temp-path=/tmp/fastcgi_temp \ @@ -63,7 +63,6 @@ COPY --from=build /tmp/nginx/objs/nginx /nginx COPY rootfs / -USER nginx:nginx WORKDIR / EXPOSE 80/tcp STOPSIGNAL SIGTERM diff --git a/rootfs/etc/group b/rootfs/etc/group old mode 100644 new mode 100755 diff --git a/rootfs/etc/nginx/html/50x.html b/rootfs/etc/nginx/html/50x.html old mode 100644 new mode 100755 diff --git a/rootfs/etc/nginx/html/index.html b/rootfs/etc/nginx/html/index.html old mode 100644 new mode 100755 diff --git a/rootfs/etc/nginx/mime.types b/rootfs/etc/nginx/mime.types old mode 100644 new mode 100755 diff --git a/rootfs/etc/nginx/nginx.conf b/rootfs/etc/nginx/nginx.conf old mode 100644 new mode 100755 diff --git a/rootfs/etc/passwd b/rootfs/etc/passwd old mode 100644 new mode 100755 diff --git a/rootfs/tmp/.keep b/rootfs/tmp/.keep old mode 100644 new mode 100755