Skip to content

Commit 2faaec3

Browse files
hhorakhhorak
authored
Merge pull request sclorg#175 from mczp/master
Add required packages for SAML2
2 parents 682afd6 + d356f6a commit 2faaec3

8 files changed

+16
-8
lines changed

‎2.7/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ LABEL io.k8s.description="Platform for building and running Python 2.7 applicati
1515
io.openshift.tags="builder,python,python27,rh-python27"
1616

1717
RUN yum install -y centos-release-scl && \
18-
INSTALL_PKGS="libjpeg-turbo libjpeg-turbo-devel python27 python27-python-devel python27-python-setuptools python27-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
18+
INSTALL_PKGS="libjpeg-turbo libjpeg-turbo-devel python27 python27-python-devel python27-python-setuptools \
19+
python27-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
1920
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
2021
rpm -V $INSTALL_PKGS && \
2122
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image

‎2.7/Dockerfile.rhel7

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ RUN yum repolist > /dev/null && \
2525
yum-config-manager --enable rhel-7-server-optional-rpms && \
2626
yum-config-manager --enable rhel-7-server-ose-3.2-rpms && \
2727
yum-config-manager --disable epel >/dev/null || : && \
28-
INSTALL_PKGS="python27 python27-python-devel python27-python-setuptools python27-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
28+
INSTALL_PKGS="python27 python27-python-devel python27-python-setuptools python27-python-pip \
29+
nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
2930
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
3031
rpm -V $INSTALL_PKGS && \
3132
# Remove redhat-logos (httpd dependency) to keep image size smaller.

‎3.3/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ LABEL io.k8s.description="Platform for building and running Python 3.3 applicati
1515
io.openshift.tags="builder,python,python33"
1616

1717
RUN yum install -y centos-release-scl && \
18-
INSTALL_PKGS="python33 python33-python-devel python33-python-setuptools nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
18+
INSTALL_PKGS="python33 python33-python-devel python33-python-setuptools nss_wrapper httpd httpd-devel \
19+
atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
1920
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
2021
rpm -V $INSTALL_PKGS && \
2122
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image

‎3.3/Dockerfile.rhel7

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ RUN yum repolist > /dev/null && \
2525
yum-config-manager --enable rhel-7-server-optional-rpms && \
2626
yum-config-manager --enable rhel-7-server-ose-3.2-rpms && \
2727
yum-config-manager --disable epel >/dev/null || : && \
28-
INSTALL_PKGS="python33 python33-python-devel python33-python-setuptools python33-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
28+
INSTALL_PKGS="python33 python33-python-devel python33-python-setuptools python33-python-pip nss_wrapper httpd httpd-devel \
29+
atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
2930
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
3031
rpm -V $INSTALL_PKGS && \
3132
# Remove redhat-logos (httpd dependency) to keep image size smaller.

‎3.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ LABEL io.k8s.description="Platform for building and running Python 3.4 applicati
1515
io.openshift.tags="builder,python,python34,rh-python34"
1616

1717
RUN yum install -y centos-release-scl && \
18-
INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
18+
INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip \
19+
nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
1920
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
2021
rpm -V $INSTALL_PKGS && \
2122
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image

‎3.4/Dockerfile.rhel7

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ RUN yum repolist > /dev/null && \
2525
yum-config-manager --enable rhel-7-server-optional-rpms && \
2626
yum-config-manager --enable rhel-7-server-ose-3.2-rpms && \
2727
yum-config-manager --disable epel >/dev/null || : && \
28-
INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
28+
INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper httpd httpd-devel \
29+
atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
2930
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
3031
rpm -V $INSTALL_PKGS && \
3132
# Remove redhat-logos (httpd dependency) to keep image size smaller.

‎3.5/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ LABEL io.k8s.description="Platform for building and running Python 3.5 applicati
1616

1717
RUN yum install -y centos-release-scl-rh && \
1818
yum-config-manager --enable centos-sclo-rh-testing && \
19-
INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
19+
INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip \
20+
nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
2021
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
2122
rpm -V $INSTALL_PKGS && \
2223
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image

‎3.5/Dockerfile.rhel7

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ RUN yum repolist > /dev/null && \
2525
yum-config-manager --enable rhel-7-server-optional-rpms && \
2626
yum-config-manager --enable rhel-7-server-ose-3.2-rpms && \
2727
yum-config-manager --disable epel >/dev/null || : && \
28-
INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran" && \
28+
INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip \
29+
nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran libffi-devel libtool-ltdl" && \
2930
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
3031
rpm -V $INSTALL_PKGS && \
3132
# Remove redhat-logos (httpd dependency) to keep image size smaller.

0 commit comments

Comments
 (0)