Increase resources, optimize dockerfile

Author: cvarjao

postgresql-9.6/docker/Dockerfile.rhel

@@ -45,36 +45,24 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
 #
 # We need to call 2 (!) yum commands before being able to enable repositories properly
 # This is a workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1479388
-RUN yum repolist > /dev/null && \
-    yum install -y yum-utils gettext && \
-    yum-config-manager --disable \* &> /dev/null && \
-    yum-config-manager --enable rhel-server-rhscl-7-rpms && \
-    yum-config-manager --enable rhel-7-server-rpms && \
-    yum-config-manager --enable rhel-7-server-optional-rpms && \
-    INSTALL_PKGS="rsync tar gettext bind-utils rh-postgresql96 rh-postgresql96-postgresql-contrib nss_wrapper rh-postgresql96-postgresql-server rh-postgresql96-postgresql-devel" && \
-    yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
+RUN set -x && \
+    YUM_ENABLE_REPOS="'--enablerepo=rhel-server-rhscl-7-rpms' '--enablerepo=rhel-7-server-rpms' '--enablerepo=rhel-7-server-eus-rpms' '--enablerepo=rhel-7-server-optional-rpms'" && \
+    INSTALL_PKGS="yum-utils gettext rsync tar gettext bind-utils rh-postgresql96 rh-postgresql96-postgresql-contrib nss_wrapper rh-postgresql96-postgresql-server rh-postgresql96-postgresql-devel" && \
+    yum -y '--disablerepo=*' $YUM_ENABLE_REPOS --setopt=tsflags=nodocs install $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     localedef -f UTF-8 -i en_US en_US.UTF-8 && \
     test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \
     mkdir -p /var/lib/pgsql/data && \
     /usr/libexec/fix-permissions /var/lib/pgsql && \
     /usr/libexec/fix-permissions /var/run/postgresql
 
-# install dev tools used to compile ORACLE_FDW_2_0_0
-RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \
-    yum-config-manager --enable rhel-7-server-rpms && \
-    yum-config-manager --enable rhel-7-server-eus-rpms && \
-    yum-config-manager --enable rhel-7-server-optional-rpms && \
-    yum -y groupinstall 'Development Tools' && \
-    yum clean all
-
-# install dev tools used to compile ORACLE_FDW_2_0_0
-RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \
-    yum-config-manager --enable rhel-7-server-rpms && \
-    yum-config-manager --enable rhel-7-server-eus-rpms && \
-    yum-config-manager --enable rhel-7-server-optional-rpms && \
+RUN set -x && \
+    YUM_ENABLE_REPOS="'--enablerepo=rhel-server-rhscl-7-rpms' '--enablerepo=rhel-7-server-rpms' '--enablerepo=rhel-7-server-eus-rpms' '--enablerepo=rhel-7-server-optional-rpms'" && \
+    echo 'install dev tools used to compile ORACLE_FDW_2_0_0' && \
+    yum -y '--disablerepo=*' $YUM_ENABLE_REPOS --setopt=tsflags=nodocs groupinstall 'Development Tools' && \
+    echo 'install dev tools used to compile ORACLE_FDW_2_0_0' && \
     INSTALL_PKGS="wget libaio-devel" && \
-    yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
+    yum -y '--disablerepo=*' $YUM_ENABLE_REPOS --setopt=tsflags=nodocs install $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all
 

postgresql-9.6/openshift/build.json

@@ -80,7 +80,16 @@
                         "name": "${NAME}:${OUTPUT_IMAGE_TAG}"
                     }
                 },
-                "resources": {},
+                "resources": {
+                    "requests":{
+                        "cpu": "1",
+                        "memory": "256Mi"
+                    },
+                    "limits":{
+                        "cpu": "2",
+                        "memory": "1Gi"
+                    }
+                },
                 "postCommit": {},
                 "nodeSelector": null
             }