From 1acd7f697e11482edfdb0b3779f39aa3d0529cd0 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Tue, 26 May 2020 00:37:55 +0300
Subject: [PATCH] Reduced the number of layers in debian-based images
---
mainline/buster-perl/Dockerfile | 10 ++++------
mainline/buster/Dockerfile | 10 ++++------
stable/buster-perl/Dockerfile | 10 ++++------
stable/buster/Dockerfile | 10 ++++------
4 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/mainline/buster-perl/Dockerfile b/mainline/buster-perl/Dockerfile
index 456baaa..294f86e 100644
--- a/mainline/buster-perl/Dockerfile
+++ b/mainline/buster-perl/Dockerfile
@@ -92,14 +92,12 @@ RUN set -x \
&& if [ -n "$tempDir" ]; then \
apt-get purge -y --auto-remove \
&& rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
- fi
-
+ fi \
# forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log \
- && ln -sf /dev/stderr /var/log/nginx/error.log
-
+ && ln -sf /dev/stdout /var/log/nginx/access.log \
+ && ln -sf /dev/stderr /var/log/nginx/error.log \
# make default server listen on ipv6
-RUN sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
+ && sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
/etc/nginx/conf.d/default.conf
EXPOSE 80
diff --git a/mainline/buster/Dockerfile b/mainline/buster/Dockerfile
index da20792..7042171 100644
--- a/mainline/buster/Dockerfile
+++ b/mainline/buster/Dockerfile
@@ -91,14 +91,12 @@ RUN set -x \
&& if [ -n "$tempDir" ]; then \
apt-get purge -y --auto-remove \
&& rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
- fi
-
+ fi \
# forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log \
- && ln -sf /dev/stderr /var/log/nginx/error.log
-
+ && ln -sf /dev/stdout /var/log/nginx/access.log \
+ && ln -sf /dev/stderr /var/log/nginx/error.log \
# make default server listen on ipv6
-RUN sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
+ && sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
/etc/nginx/conf.d/default.conf
EXPOSE 80
diff --git a/stable/buster-perl/Dockerfile b/stable/buster-perl/Dockerfile
index f313a7b..2cc01e5 100644
--- a/stable/buster-perl/Dockerfile
+++ b/stable/buster-perl/Dockerfile
@@ -92,14 +92,12 @@ RUN set -x \
&& if [ -n "$tempDir" ]; then \
apt-get purge -y --auto-remove \
&& rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
- fi
-
+ fi \
# forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log \
- && ln -sf /dev/stderr /var/log/nginx/error.log
-
+ && ln -sf /dev/stdout /var/log/nginx/access.log \
+ && ln -sf /dev/stderr /var/log/nginx/error.log \
# make default server listen on ipv6
-RUN sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
+ && sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
/etc/nginx/conf.d/default.conf
EXPOSE 80
diff --git a/stable/buster/Dockerfile b/stable/buster/Dockerfile
index 22085bc..cce6f7d 100644
--- a/stable/buster/Dockerfile
+++ b/stable/buster/Dockerfile
@@ -91,14 +91,12 @@ RUN set -x \
&& if [ -n "$tempDir" ]; then \
apt-get purge -y --auto-remove \
&& rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
- fi
-
+ fi \
# forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log \
- && ln -sf /dev/stderr /var/log/nginx/error.log
-
+ && ln -sf /dev/stdout /var/log/nginx/access.log \
+ && ln -sf /dev/stderr /var/log/nginx/error.log \
# make default server listen on ipv6
-RUN sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
+ && sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' \
/etc/nginx/conf.d/default.conf
EXPOSE 80
--
GitLab