Merge pull request sclorg#118 from tchughesiv/rhel7

ensure proper rpms installed

Author: hhorak

Dockerfile.rhel7

@@ -39,44 +39,46 @@ ENV BASH_ENV=/opt/app-root/etc/scl_enable \
 # application runtime execution.
 # TODO: Use better UID and GID values
 RUN yum repolist > /dev/null && \
-  yum-config-manager --enable rhel-7-server-optional-rpms && \
-  INSTALL_PKGS="autoconf \
-  automake \
-  bsdtar \
-  bzip2 \
-  findutils \
-  gcc-c++ \
-  gd-devel \
-  gdb \
-  gettext \
-  git \
-  libcurl-devel \
-  libxml2-devel \
-  libxslt-devel \
-  lsof \
-  make \
-  mariadb-devel \
-  mariadb-libs \
-  openssl-devel \
-  patch \
-  postgresql-devel \
-  procps-ng \
-  scl-utils \
-  sqlite-devel \
-  tar \
-  unzip \
-  wget \
-  which \
-  yum-utils \
-  zlib-devel" && \
-  mkdir -p ${HOME}/.pki/nssdb && \
-  chown -R 1001:0 ${HOME}/.pki && \
-  yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
-  rpm -V $INSTALL_PKGS && \
-  yum clean all -y && \
-  useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \
-      -c "Default Application User" default && \
-  chown -R 1001:0 /opt/app-root
+    yum-config-manager --disable \* &> /dev/null && \
+    yum-config-manager --enable rhel-7-server-rpms && \
+    yum-config-manager --enable rhel-7-server-optional-rpms && \
+    INSTALL_PKGS="autoconf \
+    automake \
+    bsdtar \
+    bzip2 \
+    findutils \
+    gcc-c++ \
+    gd-devel \
+    gdb \
+    gettext \
+    git \
+    libcurl-devel \
+    libxml2-devel \
+    libxslt-devel \
+    lsof \
+    make \
+    mariadb-devel \
+    mariadb-libs \
+    openssl-devel \
+    patch \
+    postgresql-devel \
+    procps-ng \
+    scl-utils \
+    sqlite-devel \
+    tar \
+    unzip \
+    wget \
+    which \
+    yum-utils \
+    zlib-devel" && \
+    mkdir -p ${HOME}/.pki/nssdb && \
+    chown -R 1001:0 ${HOME}/.pki && \
+    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+    rpm -V $INSTALL_PKGS && \
+    yum clean all -y && \
+    useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \
+        -c "Default Application User" default && \
+    chown -R 1001:0 /opt/app-root
 
 # Copy executable utilities.
 COPY bin/ /usr/bin/