[ARVADOS-DEV] updated: 426e8062746c72854622a7a676c8f5c51fef45ff
git at public.curoverse.com
git at public.curoverse.com
Tue Oct 27 15:21:24 EDT 2015
Summary of changes:
jenkins/dockerfiles/centos6/Dockerfile | 2 +-
jenkins/dockerfiles/debian7/Dockerfile | 2 +-
jenkins/dockerfiles/debian8/Dockerfile | 2 +-
jenkins/dockerfiles/ubuntu1204/Dockerfile | 2 +-
jenkins/dockerfiles/ubuntu1404/Dockerfile | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
via 426e8062746c72854622a7a676c8f5c51fef45ff (commit)
from 937bbde50c186d8d28bff1d8980fd701cb9b72ab (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 426e8062746c72854622a7a676c8f5c51fef45ff
Author: Ward Vandewege <ward at curoverse.com>
Date: Tue Oct 27 15:16:17 2015 -0400
Add python-pip to the Arvados build images.
this is a dependency for #7591 (refs #7591)
diff --git a/jenkins/dockerfiles/centos6/Dockerfile b/jenkins/dockerfiles/centos6/Dockerfile
index 4044dd6..928350f 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
+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
# Install golang binary
ADD generated/golang-amd64.tar.gz /usr/local/
diff --git a/jenkins/dockerfiles/debian7/Dockerfile b/jenkins/dockerfiles/debian7/Dockerfile
index 5fc25c0..daf02ab 100644
--- a/jenkins/dockerfiles/debian7/Dockerfile
+++ b/jenkins/dockerfiles/debian7/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:wheezy
MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libpq-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libpq-dev python-pip
# Install RVM
RUN gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys D39DC0E3 && \
diff --git a/jenkins/dockerfiles/debian8/Dockerfile b/jenkins/dockerfiles/debian8/Dockerfile
index 83cce32..87a0dee 100644
--- a/jenkins/dockerfiles/debian8/Dockerfile
+++ b/jenkins/dockerfiles/debian8/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:jessie
MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev python-pip
# Install RVM
RUN gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys D39DC0E3 && \
diff --git a/jenkins/dockerfiles/ubuntu1204/Dockerfile b/jenkins/dockerfiles/ubuntu1204/Dockerfile
index deab74e..478b05f 100644
--- a/jenkins/dockerfiles/ubuntu1204/Dockerfile
+++ b/jenkins/dockerfiles/ubuntu1204/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:precise
MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip
# Install RVM
RUN gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys D39DC0E3 && \
diff --git a/jenkins/dockerfiles/ubuntu1404/Dockerfile b/jenkins/dockerfiles/ubuntu1404/Dockerfile
index cf735cb..bfe6f5f 100644
--- a/jenkins/dockerfiles/ubuntu1404/Dockerfile
+++ b/jenkins/dockerfiles/ubuntu1404/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:trusty
MAINTAINER Brett Smith <brett at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip
# Install RVM
RUN gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys D39DC0E3 && \
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list