[ARVADOS] updated: 96ae27be78eeee85d9462123367b1221d5b96350

Git user git at public.curoverse.com
Fri Jul 14 13:17:33 EDT 2017


Summary of changes:
 build/package-build-dockerfiles/centos7/Dockerfile    | 3 +++
 build/package-build-dockerfiles/debian8/Dockerfile    | 3 +++
 build/package-build-dockerfiles/ubuntu1204/Dockerfile | 3 +++
 build/package-build-dockerfiles/ubuntu1404/Dockerfile | 3 +++
 build/package-build-dockerfiles/ubuntu1604/Dockerfile | 3 +++
 5 files changed, 15 insertions(+)

       via  96ae27be78eeee85d9462123367b1221d5b96350 (commit)
      from  eb66b34d22cef6c98ad9ebdc228cf784b3136b72 (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 96ae27be78eeee85d9462123367b1221d5b96350
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 14 13:16:48 2017 -0400

    11973: Upgrade setuptools in package-builder images.
    
    Old versions of setuptools cannot build a schema-salad package.
    
    refs #11973
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 0c03de6..90d2e2f 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -25,5 +25,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
 RUN touch /var/lib/rpm/* && yum -q -y install python33
 RUN scl enable python33 "easy_install-3.3 pip" && easy_install-2.7 pip
 
+# Old versions of setuptools cannot build a schema-salad package.
+RUN pip install --upgrade setuptools
+
 ENV WORKSPACE /arvados
 CMD ["scl", "enable", "python33", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"]
diff --git a/build/package-build-dockerfiles/debian8/Dockerfile b/build/package-build-dockerfiles/debian8/Dockerfile
index 99ae17f..1c46cc2 100644
--- a/build/package-build-dockerfiles/debian8/Dockerfile
+++ b/build/package-build-dockerfiles/debian8/Dockerfile
@@ -20,5 +20,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
 ADD generated/go1.8.3.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
+# Old versions of setuptools cannot build a schema-salad package.
+RUN pip install --upgrade setuptools
+
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian8"]
diff --git a/build/package-build-dockerfiles/ubuntu1204/Dockerfile b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
index 3006b6d..fd47e7d 100644
--- a/build/package-build-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
@@ -20,5 +20,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
 ADD generated/go1.8.3.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
+# Old versions of setuptools cannot build a schema-salad package.
+RUN pip install --upgrade setuptools
+
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1204"]
diff --git a/build/package-build-dockerfiles/ubuntu1404/Dockerfile b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
index 3e2c869..1a5e950 100644
--- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
@@ -20,5 +20,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
 ADD generated/go1.8.3.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
+# Old versions of setuptools cannot build a schema-salad package.
+RUN pip install --upgrade setuptools
+
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1404"]
diff --git a/build/package-build-dockerfiles/ubuntu1604/Dockerfile b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
index 85c36b5..7b0416b 100644
--- a/build/package-build-dockerfiles/ubuntu1604/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
@@ -20,5 +20,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
 ADD generated/go1.8.3.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
+# Old versions of setuptools cannot build a schema-salad package.
+RUN pip install --upgrade setuptools
+
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1604"]

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list