Merge branch '6638-backport-deps' refs #6638

[arvados-dev.git] / jenkins / dockerfiles / ubuntu1204 / Dockerfile

diff --git a/jenkins/dockerfiles/ubuntu1204/Dockerfile b/jenkins/dockerfiles/ubuntu1204/Dockerfile
index 4cdbbf8b1bd7a3cbec7932f6509c78aaffa3a3e4..642d2a0bfb6c5b7a10de602407e33c696a1fbf6d 100644 (file)
--- a/jenkins/dockerfiles/ubuntu1204/Dockerfile
+++ b/jenkins/dockerfiles/ubuntu1204/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:precise
 MAINTAINER Ward Vandewege <ward@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
+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
 
 # Install RVM
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
@@ -14,3 +14,6 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
 # Install golang binary
 ADD generated/golang-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
+
+ENV WORKSPACE /arvados
+CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1204"]