#708: Patches back #707.

CHANGELOG.md

@@ -6,6 +6,7 @@ Summary of release changes for Version 1 - CentOS-6
 
 ### 1.10.1 - Unreleased
 
+- Updates Dockerfile with combined ADD to reduce layer count in final image.
 - Fixes `scmi` installation error when using the `--manager=systemd` option on Ubuntu hosts.
 - Fixes issues with failure to install/uninstall systemd units installed with scmi.
 - Adds improvement to pull logic in systemd unit install template.

Dockerfile

@@ -2,13 +2,13 @@ FROM centos:centos6.10
 
 ARG RELEASE_VERSION="1.10.0"
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # - Import the RPM GPG keys for repositories
 # - Base install of required packages
 # - Install supervisord (used to run more than a single process)
 # - Install supervisor-stdout to allow output of services started by
 #  supervisord to be easily inspected with "docker logs".
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 RUN rpm --rebuilddb \
 	&& rpm --import \
 		http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 \
@@ -60,27 +60,21 @@ RUN rpm --rebuilddb \
 	&& rm -rf /{root,tmp,var/cache/{ldconfig,yum}}/* \
 	&& > /etc/sysconfig/i18n
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Copy files into place
-# -----------------------------------------------------------------------------
-ADD src/usr/bin \
-	/usr/bin/
-ADD src/usr/sbin \
-	/usr/sbin/
-ADD src/opt/scmi \
-	/opt/scmi/
-ADD src/etc \
-	/etc/
+# ------------------------------------------------------------------------------
+ADD src \
+	/
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Provisioning
 # - UTC Timezone
 # - Networking
 # - Configure SSH defaults for non-root public key authentication
 # - Enable the wheel sudoers group
 # - Replace placeholders with values in systemd service unit template
 # - Set permissions
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 RUN ln -sf \
 		/usr/share/zoneinfo/UTC \
 		/etc/localtime \
@@ -106,9 +100,9 @@ RUN ln -sf \
 
 EXPOSE 22
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set default environment variables
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 ENV SSH_AUTHORIZED_KEYS="" \
 	SSH_AUTOSTART_SSHD="true" \
 	SSH_AUTOSTART_SSHD_BOOTSTRAP="true" \
@@ -126,9 +120,9 @@ ENV SSH_AUTHORIZED_KEYS="" \
 	SSH_USER_PRIVATE_KEY="" \
 	SSH_USER_SHELL="/bin/bash"
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set image metadata
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \