[ARVADOS] created: 49d7a1fbd42359aa0948efd0968349eaf854d6cb
Git user
git at public.curoverse.com
Wed Jan 4 11:25:51 EST 2017
at 49d7a1fbd42359aa0948efd0968349eaf854d6cb (commit)
commit 49d7a1fbd42359aa0948efd0968349eaf854d6cb
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jan 4 11:25:43 2017 -0500
10797: Update package-building images to Ruby 2.3.1, Go 1.7.4.
diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 9987e9e..7359aca 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -16,7 +16,7 @@ ubuntu1404/generated: common-generated-all
test -d ubuntu1404/generated || mkdir ubuntu1404/generated
cp -rlt ubuntu1404/generated common-generated/*
-GOTARBALL=go1.7.1.linux-amd64.tar.gz
+GOTARBALL=go1.7.4.linux-amd64.tar.gz
common-generated-all: common-generated/$(GOTARBALL)
diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 4fcd640..21978e6 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -5,14 +5,14 @@ MAINTAINER Brett Smith <brett at curoverse.com>
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 libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel python-devel python-setuptools fuse-devel xz-libs git
# Install golang binary
-ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.4.linux-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 install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
/usr/local/rvm/bin/rvm-exec default gem install bundler && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
diff --git a/build/package-build-dockerfiles/debian8/Dockerfile b/build/package-build-dockerfiles/debian8/Dockerfile
index 977cd24..682c0ff 100644
--- a/build/package-build-dockerfiles/debian8/Dockerfile
+++ b/build/package-build-dockerfiles/debian8/Dockerfile
@@ -7,13 +7,13 @@ RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev pyth
# 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 install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
/usr/local/rvm/bin/rvm-exec default gem install bundler && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.4.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --git a/build/package-build-dockerfiles/ubuntu1204/Dockerfile b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
index b0dd906..9e6cc20 100644
--- a/build/package-build-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
@@ -7,13 +7,13 @@ RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev pyth
# 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 install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
/usr/local/rvm/bin/rvm-exec default gem install bundler && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.4.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --git a/build/package-build-dockerfiles/ubuntu1404/Dockerfile b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
index 91c5e5b..992d091 100644
--- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
@@ -7,13 +7,13 @@ RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev pyth
# 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 install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
/usr/local/rvm/bin/rvm-exec default gem install bundler && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.4.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
commit 9cc8eb72a4d8dddd2ffe2014d085517ecd0f6a67
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jan 4 11:22:49 2017 -0500
10797: Update install docs to Ruby 2.3.
diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid
index f33a067..434d8be 100644
--- a/doc/_includes/_install_ruby_and_bundler.liquid
+++ b/doc/_includes/_install_ruby_and_bundler.liquid
@@ -1,10 +1,10 @@
-Currently, only Ruby 2.1 is supported.
+Ruby 2.3 is recommended; Ruby 2.1 is also known to work.
h4(#rvm). *Option 1: Install with RVM*
<notextile>
<pre><code><span class="userinput">sudo gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-\curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=2.1
+\curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=2.3
</span></code></pre></notextile>
Either log out and log back in to activate RVM, or explicitly load it in all open shells like this:
@@ -53,8 +53,8 @@ Build and install Ruby:
<notextile>
<pre><code><span class="userinput">mkdir -p ~/src
cd ~/src
-curl http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.7.tar.gz | tar xz
-cd ruby-2.1.7
+curl -f http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz | tar xz
+cd ruby-2.3.1
./configure --disable-install-rdoc
make
sudo make install
commit 89ce36332958f698bc571eca770fb94e579957cd
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jan 4 11:19:54 2017 -0500
10797: Fix ruby warnings.
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 0e11f96..0eeee57 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -1,4 +1,4 @@
-if not File.exists?('/usr/bin/git') then
+if not File.exist?('/usr/bin/git') then
STDERR.puts "\nGit binary not found, aborting. Please install git and run gem build from a checked out copy of the git repository.\n\n"
exit
end
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.authors = ["Arvados Authors"]
s.email = 'gem-dev at curoverse.com'
#s.bindir = '.'
- s.licenses = ['Apache License, Version 2.0']
+ s.licenses = ['Apache-2.0']
s.files = ["bin/arv", "bin/arv-run-pipeline-instance",
"bin/arv-crunch-job", "bin/arv-tag", "bin/crunch-job",
"LICENSE-2.0.txt"]
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 2c4e60e..84e24f4 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -1,4 +1,4 @@
-if not File.exists?('/usr/bin/git') then
+if not File.exist?('/usr/bin/git') then
STDERR.puts "\nGit binary not found, aborting. Please install git and run gem build from a checked out copy of the git repository.\n\n"
exit
end
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.description = "Arvados client library, git commit #{git_hash}"
s.authors = ["Arvados Authors"]
s.email = 'gem-dev at curoverse.com'
- s.licenses = ['Apache License, Version 2.0']
+ s.licenses = ['Apache-2.0']
s.files = ["lib/arvados.rb", "lib/arvados/google_api_client.rb",
"lib/arvados/collection.rb", "lib/arvados/keep.rb",
"README", "LICENSE-2.0.txt"]
commit d2942208ef4bc31bc965d5f72f254b8d39a1bc9b
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jan 4 11:19:31 2017 -0500
10797: Update arvbox to Ruby 2.3.1, Go 1.7.4.
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index a894350..bfd6e24 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -17,28 +17,26 @@ RUN apt-get clean && \
linkchecker python3-virtualenv python-virtualenv xvfb iceweasel && \
apt-get clean
-ENV GOVERSION 1.7.3
+ENV GOVERSION 1.7.4
# Install golang binary
-RUN cd /usr/local && \
- curl -O http://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz && \
- tar -xzf go${GOVERSION}.linux-amd64.tar.gz && \
- rm go${GOVERSION}.linux-amd64.tar.gz
+RUN curl -f http://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | \
+ tar -C /usr/local -xzf -
ENV PATH ${PATH}:/usr/local/go/bin
-ENV RUBYVERSION 2.1.8
+ENV RUBYVERSION_MINOR 2.3
+ENV RUBYVERSION 2.3.1
# Install Ruby from source
-RUN cd /usr/local/lib && \
- curl -O http://cache.ruby-lang.org/pub/ruby/2.1/ruby-${RUBYVERSION}.tar.gz && \
- tar xzf ruby-${RUBYVERSION}.tar.gz && \
+RUN cd /tmp && \
+ curl -f http://cache.ruby-lang.org/pub/ruby/${RUBYVERSION_MINOR}/ruby-${RUBYVERSION}.tar.gz | tar -xzf - && \
cd ruby-${RUBYVERSION} && \
./configure --disable-install-doc && \
make && \
make install && \
- cd /usr/local/lib && \
- rm -rf ruby-${RUBYVERSION}.tar.gz ruby-${RUBYVERSION}
+ cd /tmp && \
+ rm -rf ruby-${RUBYVERSION}
ENV GEM_HOME /var/lib/gems
ENV GEM_PATH /var/lib/gems
@@ -54,7 +52,8 @@ RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 58118E8
RUN mkdir -p /etc/apt/sources.list.d && \
echo deb https://apt.dockerproject.org/repo debian-jessie main > /etc/apt/sources.list.d/docker.list && \
apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get -yq install docker-engine=1.9.1-0~jessie
+ apt-get -yq install docker-engine=1.9.1-0~jessie && \
+ apt-get clean
RUN rm -rf /var/lib/postgresql && mkdir -p /var/lib/postgresql
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list