[ARVADOS-DEV] updated: f266a0aa28a83f04fb81a0eaf395101091655263

git at public.curoverse.com git at public.curoverse.com
Mon Jun 29 17:00:48 EDT 2015 

Summary of changes:
 jenkins/dockerfiles/.gitignore            |  2 ++
 jenkins/dockerfiles/Makefile              | 18 +++++++++++++++++
 jenkins/dockerfiles/README                | 32 ++++++++-----------------------
 jenkins/dockerfiles/centos6/Dockerfile    | 25 ++++++++++++++++++++++++
 jenkins/dockerfiles/debian7/Dockerfile    |  2 ++
 jenkins/dockerfiles/ubuntu1204/Dockerfile |  3 +++
 6 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 jenkins/dockerfiles/.gitignore
 create mode 100644 jenkins/dockerfiles/Makefile
 create mode 100644 jenkins/dockerfiles/centos6/Dockerfile

       via  f266a0aa28a83f04fb81a0eaf395101091655263 (commit)
       via  8b7923ab53fd84c26b8ba48d672b6c2b1f816200 (commit)
       via  4e6b8664895594b7f9216fd329c91e0554e44cf5 (commit)
      from  46a766ea740a92a942666d76748e9759b4567ab6 (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 f266a0aa28a83f04fb81a0eaf395101091655263
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Jun 29 16:59:24 2015 -0400

    6388: Add Dockerfile to build packages on CentOS 6.

diff --git a/jenkins/dockerfiles/centos6/Dockerfile b/jenkins/dockerfiles/centos6/Dockerfile
new file mode 100644
index 0000000..e08665b
--- /dev/null
+++ b/jenkins/dockerfiles/centos6/Dockerfile
@@ -0,0 +1,25 @@
+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
+
+# Install golang binary
+ADD generated/golang-amd64.tar.gz /usr/local/
+RUN ln -s /usr/local/go/bin/go /usr/local/bin/
+
+# Install RVM
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+    curl -L https://get.rvm.io | bash -s stable && \
+    /usr/local/rvm/bin/rvm install 2.1 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
+    /usr/local/rvm/bin/rvm-exec default gem install fpm
+
+# Download and install Software Collections for newer requirements
+ADD https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-6-x86_64/download/rhscl-rh-python34-epel-6-x86_64.noarch.rpm https://www.softwarecollections.org/en/scls/rhscl/python27/epel-6-x86_64/download/rhscl-python27-epel-6-x86_64.noarch.rpm /opt/
+
+RUN yum -q -y install /opt/rhscl-*.rpm
+RUN yum -q -y install python27 rh-python34
+
+ENV WORKSPACE /arvados
+CMD ["scl", "enable", "rh-python34", "python27", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos6"]

commit 8b7923ab53fd84c26b8ba48d672b6c2b1f816200
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Jun 29 16:56:57 2015 -0400

    6389: Add Makefile to support Docker builds.

diff --git a/jenkins/dockerfiles/.gitignore b/jenkins/dockerfiles/.gitignore
new file mode 100644
index 0000000..ceee9fa
--- /dev/null
+++ b/jenkins/dockerfiles/.gitignore
@@ -0,0 +1,2 @@
+*/generated
+common-generated/
diff --git a/jenkins/dockerfiles/Makefile b/jenkins/dockerfiles/Makefile
new file mode 100644
index 0000000..64cf027
--- /dev/null
+++ b/jenkins/dockerfiles/Makefile
@@ -0,0 +1,18 @@
+all: centos6/generated debian7/generated ubuntu1204/generated
+
+centos6/generated: common-generated-all
+	cp -rlT common-generated centos6/generated
+
+debian7/generated: common-generated-all
+	cp -rlT common-generated debian7/generated
+
+ubuntu1204/generated: common-generated-all
+	cp -rlT common-generated ubuntu1204/generated
+
+common-generated-all: common-generated/golang-amd64.tar.gz
+
+common-generated/golang-amd64.tar.gz: common-generated
+	wget -cqO common-generated/golang-amd64.tar.gz https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
+
+common-generated:
+	mkdir common-generated
diff --git a/jenkins/dockerfiles/README b/jenkins/dockerfiles/README
index 2ae68cd..0dfab94 100644
--- a/jenkins/dockerfiles/README
+++ b/jenkins/dockerfiles/README
@@ -1,29 +1,13 @@
 ==================
-BUILD
+DOCKER IMAGE BUILD
 ==================
 
-cd dockerfiles/ubuntu1204
-docker build -t arvados/build:ubuntu1204 .
+1. `make`
+2. `cd DISTRO`
+3. `docker build -t arvados/build:DISTRO .`
 
-or
+==============
+BUILD PACKAGES
+==============
 
-cd dockerfiles/debian7
-docker build -t arvados/build:debian7 .
-
-==================
-START
-==================
-
-docker run  -v /path/to/your/arvados-dev/jenkins:/jenkins -v /path/to/your/arvados:/arvados -i -t <imagehash> /bin/bash
-
-====================
-INSIDE THE CONTAINER
-====================
-
-source /etc/profile.d/rvm.sh
-
-WORKSPACE=/arvados ./run-build-packages.sh --target debian7
-
-or
-
-WORKSPACE=/arvados ./run-build-packages.sh --target ubuntu1204
+`docker run -v /path/to/your/arvados-dev/jenkins:/jenkins -v /path/to/your/arvados:/arvados arvados/build:DISTRO`

commit 4e6b8664895594b7f9216fd329c91e0554e44cf5
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Jun 29 16:56:16 2015 -0400

    6389: Dockerfiles include the CMD to build packages.

diff --git a/jenkins/dockerfiles/debian7/Dockerfile b/jenkins/dockerfiles/debian7/Dockerfile
index b4f1768..ca4cc28 100644
--- 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 4cdbbf8..96e331c 100644
--- 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"]

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


hooks/post-receive
--

More information about the arvados-commits mailing list