From fc733490ca4636bddde38db232e1dd9eab10dc5b Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Wed, 30 Mar 2016 15:42:23 +0200 Subject: [PATCH] Enable all installed collections --- 2.7/Dockerfile | 11 +++++++++++ 2.7/Dockerfile.rhel7 | 11 +++++++++++ 3.3/Dockerfile | 11 +++++++++++ 3.3/Dockerfile.rhel7 | 11 +++++++++++ 3.4/Dockerfile | 11 +++++++++++ 3.4/Dockerfile.rhel7 | 11 +++++++++++ 6 files changed, 66 insertions(+) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 0a5743da..2376ee70 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -23,6 +23,17 @@ RUN yum install -y centos-release-scl && \ rpm -e --nodeps centos-logos && \ yum clean all -y +# -- generated by https://github.com/rhcarvalho/envdiff, do not edit manually -- +# The ENV instruction below is equivalent to: +# scl enable python27 +ENV MANPATH=/opt/rh/python27/root/usr/share/man: \ + X_SCLS=python27 \ + LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64 \ + PATH=/opt/rh/python27/root/usr/bin:$PATH \ + XDG_DATA_DIRS=/opt/rh/python27/root/usr/share \ + PKG_CONFIG_PATH=/opt/rh/python27/root/usr/lib64/pkgconfig +# ------------------------ end of generated instruction ------------------------ + # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH. COPY ./s2i/bin/ $STI_SCRIPTS_PATH diff --git a/2.7/Dockerfile.rhel7 b/2.7/Dockerfile.rhel7 index 60cfd0d8..3f947d00 100644 --- a/2.7/Dockerfile.rhel7 +++ b/2.7/Dockerfile.rhel7 @@ -28,6 +28,17 @@ RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \ rpm -e --nodeps redhat-logos && \ yum clean all -y +# -- generated by https://github.com/rhcarvalho/envdiff, do not edit manually -- +# The ENV instruction below is equivalent to: +# scl enable python27 +ENV MANPATH=/opt/rh/python27/root/usr/share/man: \ + X_SCLS=python27 \ + LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64 \ + PATH=/opt/rh/python27/root/usr/bin:$PATH \ + XDG_DATA_DIRS=/opt/rh/python27/root/usr/share \ + PKG_CONFIG_PATH=/opt/rh/python27/root/usr/lib64/pkgconfig +# ------------------------ end of generated instruction ------------------------ + # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH. COPY ./s2i/bin/ $STI_SCRIPTS_PATH diff --git a/3.3/Dockerfile b/3.3/Dockerfile index a144fb4c..346fb65b 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -23,6 +23,17 @@ RUN yum install -y centos-release-scl && \ rpm -e --nodeps centos-logos && \ yum clean all -y +# -- generated by https://github.com/rhcarvalho/envdiff, do not edit manually -- +# The ENV instruction below is equivalent to: +# scl enable python33 +ENV MANPATH=/opt/rh/python33/root/usr/share/man: \ + X_SCLS=python33 \ + LD_LIBRARY_PATH=/opt/rh/python33/root/usr/lib64 \ + PATH=/opt/rh/python33/root/usr/bin:$PATH \ + XDG_DATA_DIRS=/opt/rh/python33/root/usr/share \ + PKG_CONFIG_PATH=/opt/rh/python33/root/usr/lib64/pkgconfig +# ------------------------ end of generated instruction ------------------------ + # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH. COPY ./s2i/bin/ $STI_SCRIPTS_PATH diff --git a/3.3/Dockerfile.rhel7 b/3.3/Dockerfile.rhel7 index 0bc217f6..a3bf72e3 100644 --- a/3.3/Dockerfile.rhel7 +++ b/3.3/Dockerfile.rhel7 @@ -28,6 +28,17 @@ RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \ rpm -e --nodeps redhat-logos && \ yum clean all -y +# -- generated by https://github.com/rhcarvalho/envdiff, do not edit manually -- +# The ENV instruction below is equivalent to: +# scl enable python33 +ENV MANPATH=/opt/rh/python33/root/usr/share/man: \ + X_SCLS=python33 \ + LD_LIBRARY_PATH=/opt/rh/python33/root/usr/lib64 \ + PATH=/opt/rh/python33/root/usr/bin:$PATH \ + XDG_DATA_DIRS=/opt/rh/python33/root/usr/share \ + PKG_CONFIG_PATH=/opt/rh/python33/root/usr/lib64/pkgconfig +# ------------------------ end of generated instruction ------------------------ + # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH. COPY ./s2i/bin/ $STI_SCRIPTS_PATH diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 46516cac..a55505fa 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -23,6 +23,17 @@ RUN yum install -y centos-release-scl && \ rpm -e --nodeps centos-logos && \ yum clean all -y +# -- generated by https://github.com/rhcarvalho/envdiff, do not edit manually -- +# The ENV instruction below is equivalent to: +# scl enable rh-python34 +ENV MANPATH=/opt/rh/rh-python34/root/usr/share/man: \ + X_SCLS=rh-python34 \ + LD_LIBRARY_PATH=/opt/rh/rh-python34/root/usr/lib64 \ + PATH=/opt/rh/rh-python34/root/usr/bin:$PATH \ + XDG_DATA_DIRS=/opt/rh/rh-python34/root/usr/share \ + PKG_CONFIG_PATH=/opt/rh/rh-python34/root/usr/lib64/pkgconfig +# ------------------------ end of generated instruction ------------------------ + # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH. COPY ./s2i/bin/ $STI_SCRIPTS_PATH diff --git a/3.4/Dockerfile.rhel7 b/3.4/Dockerfile.rhel7 index 9f45b693..ae9b0776 100644 --- a/3.4/Dockerfile.rhel7 +++ b/3.4/Dockerfile.rhel7 @@ -28,6 +28,17 @@ RUN yum-config-manager --enable rhel-server-rhscl-7-rpms && \ rpm -e --nodeps redhat-logos && \ yum clean all -y +# -- generated by https://github.com/rhcarvalho/envdiff, do not edit manually -- +# The ENV instruction below is equivalent to: +# scl enable rh-python34 +ENV MANPATH=/opt/rh/rh-python34/root/usr/share/man: \ + X_SCLS=rh-python34 \ + LD_LIBRARY_PATH=/opt/rh/rh-python34/root/usr/lib64 \ + PATH=/opt/rh/rh-python34/root/usr/bin:$PATH \ + XDG_DATA_DIRS=/opt/rh/rh-python34/root/usr/share \ + PKG_CONFIG_PATH=/opt/rh/rh-python34/root/usr/lib64/pkgconfig +# ------------------------ end of generated instruction ------------------------ + # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH. COPY ./s2i/bin/ $STI_SCRIPTS_PATH