[ARVADOS-DEV] created: bebf531a2cb9cf08843d6ac4d4ae2238d58efc2b

[git at public.curoverse.com]

        at  bebf531a2cb9cf08843d6ac4d4ae2238d58efc2b (commit)


commit bebf531a2cb9cf08843d6ac4d4ae2238d58efc2b
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Dec 7 10:06:02 2015 -0500

    7953: Fix Docker image to build CentOS 6.6 packages.
    
    * Follow the Software Collections documentation at
      <https://wiki.centos.org/AdditionalResources/Repositories/SCL>.
      This downgrades us to Python 3.3, but that shouldn't be a
      problem, since we test and build packages for Debian 7 which uses
      Python 3.2.  On the plus side, it removes an external dependency
      on softwarecollections.org.
    
    * The python-pip package disappeared.  I don't know where it went.
      Maybe there were changes to the underlying centos:6 Docker image?
      Install it manually.

diff --git a/jenkins/dockerfiles/centos6/Dockerfile b/jenkins/dockerfiles/centos6/Dockerfile
index cca5e60..68134c4 100644
--- a/jenkins/dockerfiles/centos6/Dockerfile
+++ b/jenkins/dockerfiles/centos6/Dockerfile
@@ -2,7 +2,7 @@ FROM centos:6
 MAINTAINER Brett Smith <brett at curoverse.com>
 
 # Install build dependencies provided in base distribution
-RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker fuse-devel libattr-devel nss-devel libcurl-devel which tar scl-utils postgresql-devel python-pip
+RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker fuse-devel libattr-devel nss-devel libcurl-devel which tar scl-utils centos-release-SCL postgresql-devel
 
 # Install golang binary
 ADD generated/golang-amd64.tar.gz /usr/local/
@@ -15,14 +15,10 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
     /usr/local/rvm/bin/rvm-exec default gem install bundle fpm
 
-# Download and install Software Collections for newer requirements
-ADD https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-6-x86_64/download/rhscl-rh-python34-epel-6-x86_64.noarch.rpm https://www.softwarecollections.org/en/scls/rhscl/python27/epel-6-x86_64/download/rhscl-python27-epel-6-x86_64.noarch.rpm /opt/
-
-RUN yum -q -y install /opt/rhscl-*.rpm
-
 # Need to "touch" RPM database to workaround bug in interaction between
 # overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
-RUN touch /var/lib/rpm/* && yum -q -y install python27 rh-python34
+RUN touch /var/lib/rpm/* && yum -q -y install python27 python33
+RUN scl enable python33 "easy_install-3.3 pip" && scl enable python27 "easy_install-2.7 pip"
 
 ENV WORKSPACE /arvados
-CMD ["scl", "enable", "rh-python34", "python27", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos6"]
+CMD ["scl", "enable", "python33", "python27", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos6"]

-----------------------------------------------------------------------


hooks/post-receive
--