diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 8bcdd84e..ac595d86 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -15,9 +15,10 @@ LABEL io.k8s.description="Platform for building and running Python 2.7 applicati io.openshift.expose-services="8080:http" \ io.openshift.tags="builder,python,python27,rh-python27" -RUN yum install -y centos-release-scl && \ - yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus python27 python27-python-devel python27-python-setuptools python27-python-pip epel-release && \ - yum install -y --setopt=tsflags=nodocs install nss_wrapper && \ +RUN INSTALL_PKGS="python27 python27-python-devel python27-python-setuptools python27-python-pip epel-release nss_wrapper" && \ + yum install -y centos-release-scl && \ + yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \ + rpm -V $INSTALL_PKGS && \ yum clean all -y # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/2.7/Dockerfile.rhel7 b/2.7/Dockerfile.rhel7 index bfcdce26..b8e50580 100644 --- a/2.7/Dockerfile.rhel7 +++ b/2.7/Dockerfile.rhel7 @@ -20,10 +20,11 @@ LABEL Name="rhscl/python-27-rhel7" \ Release="1" \ Architecture="x86_64" -RUN yum-config-manager --enable rhel-server-rhscl-7-rpms \ +RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \ yum-config-manager --enable rhel-7-server-optional-rpms && \ yum-config-manager --disable epel >/dev/null || : && \ - yum install -y --setopt=tsflags=nodocs python27 python27-python-devel python27-python-setuptools python27-python-pip nss_wrapper && \ + INSTALL_PKGS="python27 python27-python-devel python27-python-setuptools python27-python-pip nss_wrapper" && \ + yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && rpm -V $INSTALL_PKGS && \ yum clean all -y # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/3.3/Dockerfile b/3.3/Dockerfile index dbe51fa5..5cad03fd 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -15,8 +15,9 @@ LABEL io.k8s.description="Platform for building and running Python 3.3 applicati io.openshift.tags="builder,python,python33" RUN yum install -y centos-release-scl && \ - yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus python33 python33-python-devel python33-python-setuptools epel-release && \ - yum install -y --setopt=tsflags=nodocs install nss_wrapper && \ + INSTALL_PKGS="python33 python33-python-devel python33-python-setuptools epel-release nss_wrapper" && \ + yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \ + rpm -V $INSTALL_PKGS && \ yum clean all -y # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/3.3/Dockerfile.rhel7 b/3.3/Dockerfile.rhel7 index da271d8c..8c68ec77 100644 --- a/3.3/Dockerfile.rhel7 +++ b/3.3/Dockerfile.rhel7 @@ -20,10 +20,12 @@ LABEL BZComponent="openshift-sti-python-docker" \ Release="1" \ Architecture="x86_64" -RUN yum-config-manager --enable rhel-server-rhscl-7-rpms \ +RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \ yum-config-manager --enable rhel-7-server-optional-rpms && \ yum-config-manager --disable epel >/dev/null || : && \ - yum install -y --setopt=tsflags=nodocs python33 python33-python-devel python33-python-setuptools python33-python-pip nss_wrapper && \ + INSTALL_PKGS="python33 python33-python-devel python33-python-setuptools python33-python-pip nss_wrapper" && \ + yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ + rpm -V $INSTALL_PKGS && \ yum clean all -y # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 7a9821b6..4c2445be 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -15,9 +15,10 @@ LABEL io.k8s.description="Platform for building and running Python 3.4 applicati io.openshift.expose-services="8080:http" \ io.openshift.tags="builder,python,python34,rh-python34" -RUN yum install -y centos-release-scl && \ - yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip epel-release && \ - yum install -y --setopt=tsflags=nodocs install nss_wrapper && \ +RUN yum install --enablerepo=centosplus -y centos-release-scl epel-release && \ + INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper" && \ + yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \ + rpm -V $INSTALL_PKGS && \ yum clean all -y # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/3.4/Dockerfile.rhel7 b/3.4/Dockerfile.rhel7 index 26d47aa7..005d23c4 100644 --- a/3.4/Dockerfile.rhel7 +++ b/3.4/Dockerfile.rhel7 @@ -20,10 +20,12 @@ LABEL Name="rhscl/python-34-rhel7" \ Release="1" \ Architecture="x86_64" -RUN yum-config-manager --enable rhel-server-rhscl-7-rpms \ +RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \ yum-config-manager --enable rhel-7-server-optional-rpms && \ yum-config-manager --disable epel >/dev/null || : && \ - yum install -y --setopt=tsflags=nodocs rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper && \ + INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper" && \ + yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ + rpm -V $INSTALL_PKGS && \ yum clean all -y # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH