projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 73f6f1b)
6389: Dockerfiles include the CMD to build packages.
authorBrett Smith <brett@curoverse.com>
Mon, 29 Jun 2015 20:56:16 +0000 (16:56 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 8 Jul 2015 14:07:19 +0000 (10:07 -0400)
jenkins/dockerfiles/debian7/Dockerfile patch | blob | history
jenkins/dockerfiles/ubuntu1204/Dockerfile patch | blob | history

diff --git a/jenkins/dockerfiles/debian7/Dockerfile b/jenkins/dockerfiles/debian7/Dockerfile
index b4f1768433ef91fcb39e85f13e1bd8ad54e2cda3..ca4cc283c555fb70a8a99edf14a54d9584ce6c9a 100644 (file)
--- a/jenkins/dockerfiles/debian7/Dockerfile
+++ b/jenkins/dockerfiles/debian7/Dockerfile
@@ -15,3 +15,5 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
 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", "debian7"]
diff --git a/jenkins/dockerfiles/ubuntu1204/Dockerfile b/jenkins/dockerfiles/ubuntu1204/Dockerfile
index 4cdbbf8b1bd7a3cbec7932f6509c78aaffa3a3e4..96e331c2d07edcc693db66463224366b876486f4 100644 (file)
--- a/jenkins/dockerfiles/ubuntu1204/Dockerfile
+++ b/jenkins/dockerfiles/ubuntu1204/Dockerfile
@@ -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"]