[ARVADOS-DEV] updated: aa569f0b4c661ec83fb5be6574250f1c3f713119
git at public.curoverse.com
git at public.curoverse.com
Wed Jul 8 10:09:41 EDT 2015
Summary of changes:
jenkins/dockerfiles/.gitignore | 2 ++
jenkins/dockerfiles/Makefile | 21 +++++++++++++++++++++
jenkins/dockerfiles/README | 13 +++++++++++++
jenkins/dockerfiles/centos6/Dockerfile | 25 +++++++++++++++++++++++++
jenkins/dockerfiles/debian7/Dockerfile | 19 +++++++++++++++++++
jenkins/dockerfiles/ubuntu1204/Dockerfile | 19 +++++++++++++++++++
6 files changed, 99 insertions(+)
create mode 100644 jenkins/dockerfiles/.gitignore
create mode 100644 jenkins/dockerfiles/Makefile
create mode 100644 jenkins/dockerfiles/README
create mode 100644 jenkins/dockerfiles/centos6/Dockerfile
create mode 100644 jenkins/dockerfiles/debian7/Dockerfile
create mode 100644 jenkins/dockerfiles/ubuntu1204/Dockerfile
via aa569f0b4c661ec83fb5be6574250f1c3f713119 (commit)
via 08c24c27a61b52063146576e9c80773b0e481f37 (commit)
via 8f04915e13d44ce5028eb07f3eed3879a592f11b (commit)
via 5dfd1323ad00fa86e008072e8a1b19f9869b586f (commit)
via 73f6f1bb2bc589b28f5779521de5db4aa0993deb (commit)
from 510a6b6a1a8e263a7cfb305032ae3ef07d88a400 (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 aa569f0b4c661ec83fb5be6574250f1c3f713119
Merge: 510a6b6 08c24c2
Author: Brett Smith <brett at curoverse.com>
Date: Wed Jul 8 10:09:25 2015 -0400
Merge branch '6389-add-dockerfiles'
Closes #6389, #6456.
commit 08c24c27a61b52063146576e9c80773b0e481f37
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/Makefile b/jenkins/dockerfiles/Makefile
index 046495a..9d2b4a8 100644
--- a/jenkins/dockerfiles/Makefile
+++ b/jenkins/dockerfiles/Makefile
@@ -1,4 +1,8 @@
-all: debian7/generated ubuntu1204/generated
+all: centos6/generated debian7/generated ubuntu1204/generated
+
+centos6/generated: common-generated-all
+ test -d centos6/generated || mkdir centos6/generated
+ cp -rlt centos6/generated common-generated/*
debian7/generated: common-generated-all
test -d debian7/generated || mkdir debian7/generated
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 8f04915e13d44ce5028eb07f3eed3879a592f11b
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..046495a
--- /dev/null
+++ b/jenkins/dockerfiles/Makefile
@@ -0,0 +1,17 @@
+all: debian7/generated ubuntu1204/generated
+
+debian7/generated: common-generated-all
+ test -d debian7/generated || mkdir debian7/generated
+ cp -rlt debian7/generated common-generated/*
+
+ubuntu1204/generated: common-generated-all
+ test -d ubuntu1204/generated || mkdir ubuntu1204/generated
+ cp -rlt ubuntu1204/generated common-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 5dfd1323ad00fa86e008072e8a1b19f9869b586f
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"]
commit 73f6f1bb2bc589b28f5779521de5db4aa0993deb
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri Jun 26 17:07:32 2015 -0400
Add dockerfiles for Debian7 and Ubuntu1204
refs #6389
diff --git a/jenkins/dockerfiles/README b/jenkins/dockerfiles/README
new file mode 100644
index 0000000..2ae68cd
--- /dev/null
+++ b/jenkins/dockerfiles/README
@@ -0,0 +1,29 @@
+==================
+BUILD
+==================
+
+cd dockerfiles/ubuntu1204
+docker build -t arvados/build:ubuntu1204 .
+
+or
+
+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
diff --git a/jenkins/dockerfiles/debian7/Dockerfile b/jenkins/dockerfiles/debian7/Dockerfile
new file mode 100644
index 0000000..b4f1768
--- /dev/null
+++ b/jenkins/dockerfiles/debian7/Dockerfile
@@ -0,0 +1,17 @@
+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
+
+# 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
+
+# Install golang binary
+ADD generated/golang-amd64.tar.gz /usr/local/
+RUN ln -s /usr/local/go/bin/go /usr/local/bin/
+
diff --git a/jenkins/dockerfiles/ubuntu1204/Dockerfile b/jenkins/dockerfiles/ubuntu1204/Dockerfile
new file mode 100644
index 0000000..4cdbbf8
--- /dev/null
+++ b/jenkins/dockerfiles/ubuntu1204/Dockerfile
@@ -0,0 +1,16 @@
+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
+
+# 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
+
+# Install golang binary
+ADD generated/golang-amd64.tar.gz /usr/local/
+RUN ln -s /usr/local/go/bin/go /usr/local/bin/
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list