[ARVADOS-DEV] updated: 4690e2bf79cfef03c548e08fd5cf67efa709ad12
git at public.curoverse.com
git at public.curoverse.com
Fri Jul 10 14:09:41 EDT 2015
Summary of changes:
jenkins/dockerfiles/Makefile | 6 +++++-
jenkins/dockerfiles/{ubuntu1204 => debian8}/Dockerfile | 6 +++---
jenkins/run-build-packages.sh | 16 ++++++++++++++++
3 files changed, 24 insertions(+), 4 deletions(-)
copy jenkins/dockerfiles/{ubuntu1204 => debian8}/Dockerfile (84%)
via 4690e2bf79cfef03c548e08fd5cf67efa709ad12 (commit)
from bdfbb8c113d8e7f63bb8caa57010437826c59dc9 (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 4690e2bf79cfef03c548e08fd5cf67efa709ad12
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri Jul 10 14:07:39 2015 -0400
Add debian8 as a build target.
No issue #
diff --git a/jenkins/dockerfiles/Makefile b/jenkins/dockerfiles/Makefile
index 9d2b4a8..3d6eec6 100644
--- a/jenkins/dockerfiles/Makefile
+++ b/jenkins/dockerfiles/Makefile
@@ -1,4 +1,4 @@
-all: centos6/generated debian7/generated ubuntu1204/generated
+all: centos6/generated debian7/generated debian8/generated ubuntu1204/generated
centos6/generated: common-generated-all
test -d centos6/generated || mkdir centos6/generated
@@ -8,6 +8,10 @@ debian7/generated: common-generated-all
test -d debian7/generated || mkdir debian7/generated
cp -rlt debian7/generated common-generated/*
+debian8/generated: common-generated-all
+ test -d debian8/generated || mkdir debian8/generated
+ cp -rlt debian8/generated common-generated/*
+
ubuntu1204/generated: common-generated-all
test -d ubuntu1204/generated || mkdir ubuntu1204/generated
cp -rlt ubuntu1204/generated common-generated/*
diff --git a/jenkins/dockerfiles/debian8/Dockerfile b/jenkins/dockerfiles/debian8/Dockerfile
new file mode 100644
index 0000000..5b81434
--- /dev/null
+++ b/jenkins/dockerfiles/debian8/Dockerfile
@@ -0,0 +1,19 @@
+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
+
+# 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/
+
+ENV WORKSPACE /arvados
+CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian8"]
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index f2ce33a..af35285 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -108,6 +108,22 @@ case "$TARGET" in
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests)
;;
+ debian8)
+ FORMAT=deb
+ FPM_OUTDIR=tmp
+ REPO_UPDATE_CMD='freight add *deb apt/wheezy && freight cache && rsync -AaHX /var/www/freight/ /var/www/freight-production/ --delete && rm -f *deb'
+
+ PYTHON2_PACKAGE=python$PYTHON2_VERSION
+ PYTHON2_PKG_PREFIX=python
+ PYTHON3_PACKAGE=python$PYTHON3_VERSION
+ PYTHON3_PKG_PREFIX=python3
+ PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
+ oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+ rsa uritemplate httplib2 ws4py \
+ virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
+ ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
+ PYTHON3_BACKPORTS=(docker-py six requests)
+ ;;
ubuntu1204)
FORMAT=deb
FPM_OUTDIR=tmp
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list