Move contrib to root/opt/app-root and update common

Fix missing indentation

.gitignore

@@ -0,0 +1,3 @@
+# help.1 files complied by container-common-scripts from README.md files
+*/root/help.1
+

base/Dockerfile

@@ -30,4 +30,4 @@ RUN INSTALL_PKGS="autoconf \
   zlib-devel" && \
   yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
   rpm -V $INSTALL_PKGS && \
-yum clean all -y
+  yum clean all -y

base/Dockerfile.rhel7

@@ -36,4 +36,4 @@ RUN INSTALL_PKGS="autoconf \
   zlib-devel" && \
   yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
   rpm -V $INSTALL_PKGS && \
-yum clean all -y
+  yum clean all -y

core/Dockerfile

@@ -18,10 +18,12 @@ ENV \
     HOME=/opt/app-root/src \
     PATH=/opt/app-root/src/bin:/opt/app-root/bin:$PATH
 
+# Copy extra files to the image.
+COPY ./root/ /
+
 # When bash is started non-interactively, to run a shell script, for example it
 # looks for this variable and source the content of this file. This will enable
 # the SCL for all scripts without need to do 'scl enable'.
-COPY contrib/scl_enable /opt/app-root/etc/scl_enable
 ENV BASH_ENV=/opt/app-root/etc/scl_enable \
     ENV=/opt/app-root/etc/scl_enable \
     PROMPT_COMMAND=". /opt/app-root/etc/scl_enable"
@@ -48,9 +50,6 @@ RUN rpmkeys --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
       -c "Default Application User" default && \
   chown -R 1001:0 /opt/app-root
 
-# Copy executable utilities.
-COPY bin/ /usr/bin/
-
 # Directory with the sources is set as the working directory so all STI scripts
 # can execute relative to this path.
 WORKDIR ${HOME}

core/Dockerfile.rhel7

@@ -25,10 +25,12 @@ ENV \
     HOME=/opt/app-root/src \
     PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
+# Copy extra files to the image.
+COPY ./root/ /
+
 # When bash is started non-interactively, to run a shell script, for example it
 # looks for this variable and source the content of this file. This will enable
 # the SCL for all scripts without need to do 'scl enable'.
-COPY contrib/scl_enable /opt/app-root/etc/scl_enable
 ENV BASH_ENV=/opt/app-root/etc/scl_enable \
     ENV=/opt/app-root/etc/scl_enable \
     PROMPT_COMMAND=". /opt/app-root/etc/scl_enable"
@@ -58,9 +60,6 @@ RUN yum repolist > /dev/null && \
       -c "Default Application User" default && \
   chown -R 1001:0 /opt/app-root
 
-# Copy executable utilities.
-COPY bin/ /usr/bin/
-
 # Directory with the sources is set as the working directory so all STI scripts
 # can execute relative to this path.
 WORKDIR ${HOME}