X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44ceaa474a330f12dd9e00115af107d7258044f2..ea8dcefcfdfea0e90ba5c45e2e692f5e59088e6b:/build/package-build-dockerfiles/centos6/Dockerfile diff --git a/build/package-build-dockerfiles/centos6/Dockerfile b/build/package-build-dockerfiles/centos6/Dockerfile index c21c091822..8d969e6085 100644 --- a/build/package-build-dockerfiles/centos6/Dockerfile +++ b/build/package-build-dockerfiles/centos6/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Brett Smith 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 libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel # Install golang binary -ADD generated/golang-amd64.tar.gz /usr/local/ +ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/ RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install RVM @@ -26,7 +26,8 @@ RUN scl enable python33 "easy_install-3.3 pip" && scl enable python27 "easy_inst RUN ln -s /usr/lib64/liblzma.so.0 /usr/lib64/lzma.so.5 RUN cd /tmp && \ - curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' && \ + (curl -OLf 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' || \ + curl -OLf 'http://repoforge.eecs.wsu.edu/redhat/el6/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm') && \ rpm -ivh rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm && \ sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo