[ARVADOS] updated: 5d2ef6f7a2a8f93ec411c420287f30af92294520
Git user
git at public.curoverse.com
Tue Nov 15 14:32:58 EST 2016
Summary of changes:
.gitignore | 3 +++
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 30 ++++++++++----------------
2 files changed, 14 insertions(+), 19 deletions(-)
via 5d2ef6f7a2a8f93ec411c420287f30af92294520 (commit)
from 4225d058e0bc4380203fe5959e7e54febc91e83b (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 5d2ef6f7a2a8f93ec411c420287f30af92294520
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Nov 15 14:32:53 2016 -0500
10410: Add -o Acquire::Retries and combine package installation into single layer.
Add some packaging and arvbox-related files to .gitignore.
diff --git a/.gitignore b/.gitignore
index d5c4b37..8f2b33a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@ sdk/java/target
*.class
sdk/java/log
tmp
+sdk/cli/binstubs/
+sdk/cwl/arvados_cwl/_version.py
+services/api/config/arvados-clients.yml
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 2c5cf3b..6568a88 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -1,29 +1,21 @@
FROM debian:8
-RUN apt-get update
+ENV DEBIAN_FRONTEND noninteractive
-# Break up the package installation over multiple layers so that a download
-# hiccup doesn't require starting over.
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yq --no-install-recommends install \
- postgresql-9.4 git build-essential runit curl libpq-dev
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yq --no-install-recommends install \
+RUN apt-get clean && \
+ 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 \
openssh-server python-setuptools netcat-traditional \
- python-epydoc graphviz bzip2 less sudo virtualenv
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yq --no-install-recommends install \
+ python-epydoc graphviz bzip2 less sudo virtualenv \
libpython-dev fuse libfuse-dev python-pip python-yaml \
- pkg-config libattr1-dev python-llfuse python-pycurl
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yq --no-install-recommends install \
+ pkg-config libattr1-dev python-llfuse python-pycurl \
libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
libjson-perl nginx gitolite3 lsof libreadline-dev \
- apt-transport-https ca-certificates slurm-wlm
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yq --no-install-recommends install \
- linkchecker python3-virtualenv python-virtualenv xvfb iceweasel
+ apt-transport-https ca-certificates slurm-wlm \
+ linkchecker python3-virtualenv python-virtualenv xvfb iceweasel && \
+ apt-get clean
ENV GOVERSION 1.7.3
@@ -37,7 +29,7 @@ ENV PATH ${PATH}:/usr/local/go/bin
ENV RUBYVERSION 2.1.8
-# Install RVM
+# 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 && \
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list