[ARVADOS] updated: ea8dcefcfdfea0e90ba5c45e2e692f5e59088e6b

Git user git at public.curoverse.com
Wed Sep 7 22:02:38 EDT 2016


Summary of changes:
 build/package-build-dockerfiles/centos6/Dockerfile | 4 ++--
 build/package-test-dockerfiles/centos6/Dockerfile  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  ea8dcefcfdfea0e90ba5c45e2e692f5e59088e6b (commit)
      from  19aca702ed17c7c89a5ba7d828a77105131e54db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ea8dcefcfdfea0e90ba5c45e2e692f5e59088e6b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Sep 7 22:02:20 2016 -0400

    Add -f argument to curl to exit nonzero and try mirror if primary
    rpmforge-release url fails, refs #9944

diff --git a/build/package-build-dockerfiles/centos6/Dockerfile b/build/package-build-dockerfiles/centos6/Dockerfile
index 81f1f60..8d969e6 100644
--- a/build/package-build-dockerfiles/centos6/Dockerfile
+++ b/build/package-build-dockerfiles/centos6/Dockerfile
@@ -26,8 +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 -OL 'http://repoforge.eecs.wsu.edu/redhat/el6/en/x86_64/rpmforge/RPMS/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
 
diff --git a/build/package-test-dockerfiles/centos6/Dockerfile b/build/package-test-dockerfiles/centos6/Dockerfile
index e29bbca..d38507a 100644
--- a/build/package-test-dockerfiles/centos6/Dockerfile
+++ b/build/package-test-dockerfiles/centos6/Dockerfile
@@ -14,8 +14,8 @@ RUN touch /var/lib/rpm/* && \
     /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
 
 RUN cd /tmp && \
-    (curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' || \
-     curl -OL 'http://repoforge.eecs.wsu.edu/redhat/el6/en/x86_64/rpmforge/RPMS/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
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list