Docker: merge RUN instructions for less layer (-3)

yacy · Aug 23, 2018 · 04c9584 · 04c9584
1 parent 3121825
commit 04c9584
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -32,17 +32,15 @@ RUN apt-get update && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/*
 
+RUN \
 # Set initial admin password : "docker" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex())
-RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init
-
+	sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init && \
 # Intially enable HTTPS : this is the most secure option for remote administrator authentication
-RUN sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init
-
+	sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init && \
 # Create user and group yacy : this user will be used to run YaCy main process
-RUN adduser --system --group --no-create-home --disabled-password yacy
-
+	adduser --system --group --no-create-home --disabled-password yacy && \
 # Set ownership of yacy install directory to yacy user/group
-RUN chown yacy:yacy -R /opt/yacy_search_server
+	chown yacy:yacy -R /opt/yacy_search_server
 
 # Expose HTTP and HTTPS default ports
 EXPOSE 8090 8443

diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -61,17 +61,15 @@ RUN apk add --no-cache git && \
 	rm -rf /opt/ant && \
 	apk del git
 
+RUN \
 # Set initial admin password : "docker" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex())
-RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init
-
+	sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init && \
 # Intially enable HTTPS : this is the most secure option for remote administrator authentication
-RUN sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init
-
+	sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init && \
 # Create user and group yacy : this user will be used to run YaCy main process
-RUN addgroup yacy && adduser -S -G yacy -H -D yacy
-
+	addgroup yacy && adduser -S -G yacy -H -D yacy && \
 # Set ownership of yacy install directory to yacy user/group
-RUN chown yacy:yacy -R /opt/yacy_search_server
+	chown yacy:yacy -R /opt/yacy_search_server
 
 # Expose HTTP and HTTPS default ports
 EXPOSE 8090 8443