X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4bccbaed84c6b398f4cb4dbc7a9bc345e79d6550..0561bd0c3c07257fd58ded6c7cfa5feeae97af57:/tools/arvbox/lib/arvbox/docker/Dockerfile.base?ds=sidebyside

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 6568a887b3..b21e49e353 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -1,9 +1,12 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 FROM debian:8
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get clean && \
-    apt-get update && \
+RUN apt-get update && \
     apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
     postgresql-9.4 git build-essential runit curl libpq-dev \
     libcurl4-openssl-dev libssl-dev zlib1g-dev libpcre3-dev \
@@ -14,31 +17,30 @@ RUN apt-get clean && \
     libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
     libjson-perl nginx gitolite3 lsof libreadline-dev \
     apt-transport-https ca-certificates slurm-wlm \
-    linkchecker python3-virtualenv python-virtualenv xvfb iceweasel && \
+    linkchecker python3-virtualenv python-virtualenv xvfb iceweasel \
+    libgnutls28-dev python3-dev && \
     apt-get clean
 
-ENV GOVERSION 1.7.3
+ENV GOVERSION 1.8.3
 
 # 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.3
 
 # 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 +56,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
 
@@ -68,6 +71,8 @@ RUN set -e && \
  tar -C /usr/local -xjf /tmp/$PJS.tar.bz2 && \
  ln -s ../$PJS/bin/phantomjs /usr/local/bin/
 
+RUN pip install -U setuptools
+
 ARG arvados_version
 RUN echo arvados_version is git commit $arvados_version