[ARVADOS] updated: ce6f044cfd55f761ec37112554aeab578b3ab476
git at public.curoverse.com
git at public.curoverse.com
Thu Oct 30 14:28:20 EDT 2014
Summary of changes:
docker/api/Dockerfile | 9 +++++----
docker/base/Dockerfile | 11 ++++++-----
docker/compute/Dockerfile | 5 +++--
docker/doc/Dockerfile | 4 ++--
docker/java-bwa-samtools/Dockerfile | 4 ++--
docker/passenger/Dockerfile | 13 ++++++++-----
docker/shell/Dockerfile | 7 ++++++-
docker/slurm/Dockerfile | 3 ++-
docker/workbench/Dockerfile | 3 ++-
9 files changed, 36 insertions(+), 23 deletions(-)
via ce6f044cfd55f761ec37112554aeab578b3ab476 (commit)
from 1bcfc05de27282f239de4124225e27d05a1d149a (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 ce6f044cfd55f761ec37112554aeab578b3ab476
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Oct 30 14:27:58 2014 -0400
3824: Remove redundant "apt-get update", standardize on "apt-get update -qq" and "apt-get install -qqy".
diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index fc2e3e4..ee9198e 100644
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -4,10 +4,11 @@ FROM arvados/passenger
MAINTAINER Tim Pierce <twp at curoverse.com>
# Install postgres and apache.
-RUN apt-get update && \
- apt-get -q -y install procps postgresql postgresql-server-dev-9.1 apache2 slurm-llnl munge \
- supervisor sudo libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
- libjson-perl cron
+RUN apt-get update -qq
+RUN apt-get install -qqy \
+ procps postgresql postgresql-server-dev-9.1 apache2 slurm-llnl munge \
+ supervisor sudo libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
+ libjson-perl cron
ADD munge.key /etc/munge/
RUN chown munge:munge /etc/munge/munge.key && chmod 600 /etc/munge/munge.key
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index b90b44c..01eec03 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -10,8 +10,11 @@ ENV DEBIAN_FRONTEND noninteractive
# * git, curl, rvm
# * Arvados source code in /usr/src/arvados, for preseeding gem installation
-RUN apt-get update && \
- apt-get -q -y install -q -y openssh-server apt-utils git curl \
+ADD apt.arvados.org.list /etc/apt/sources.list.d/
+RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
+RUN apt-get update -qq
+
+RUN apt-get install -qqy openssh-server apt-utils git curl \
libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
postgresql-server-dev-9.1 && \
/bin/mkdir -p /root/.ssh && \
@@ -22,9 +25,7 @@ RUN apt-get update && \
/usr/local/rvm/bin/rvm alias create default ruby && \
/bin/mkdir -p /usr/src/arvados
-ADD apt.arvados.org.list /etc/apt/sources.list.d/
-RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
-RUN apt-get update && apt-get -qqy install python-arvados-python-client
+RUN apt-get install -qqy python-arvados-python-client
ADD generated/arvados.tar.gz /usr/src/arvados/
diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 9a5fc64..1dd3889 100644
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -3,7 +3,8 @@
FROM arvados/slurm
MAINTAINER Ward Vandewege <ward at curoverse.com>
-RUN apt-get update && apt-get -qqy install supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron dnsmasq
+RUN apt-get update -qq
+RUN apt-get install -qqy supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron dnsmasq
ADD fuse.conf /etc/fuse.conf
RUN chmod 644 /etc/fuse.conf
@@ -11,7 +12,7 @@ RUN chmod 644 /etc/fuse.conf
RUN /usr/local/rvm/bin/rvm-exec default gem install arvados-cli arvados
# Install Docker from the Arvados package repository (cf. arvados/base)
-RUN apt-get update -qq && apt-get install -qqy iptables ca-certificates lxc apt-transport-https docker.io
+RUN apt-get install -qqy iptables ca-certificates lxc apt-transport-https docker.io
RUN addgroup --gid 4005 crunch && mkdir /home/crunch && useradd --uid 4005 --gid 4005 crunch && usermod crunch -G fuse,docker && chown crunch:crunch /home/crunch
diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 783874f..aa51a38 100644
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -5,8 +5,8 @@ maintainer Ward Vandewege <ward at curoverse.com>
# Install packages
RUN /bin/mkdir -p /usr/src/arvados && \
- apt-get update && \
- apt-get install -q -y curl procps apache2-mpm-worker
+ apt-get update -qq && \
+ apt-get install -qqy curl procps apache2-mpm-worker
ADD generated/doc.tar.gz /usr/src/arvados/
diff --git a/docker/java-bwa-samtools/Dockerfile b/docker/java-bwa-samtools/Dockerfile
index c12bf06..5dae9a6 100644
--- a/docker/java-bwa-samtools/Dockerfile
+++ b/docker/java-bwa-samtools/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
USER root
-RUN apt-get update && \
- apt-get install -y -q openjdk-7-jre-headless && \
+RUN apt-get update -qq
+RUN apt-get install -qqy openjdk-7-jre-headless && \
cd /tmp && \
curl --location http://downloads.sourceforge.net/project/bio-bwa/bwa-0.7.9a.tar.bz2 -o bwa-0.7.9a.tar.bz2 && \
tar xjf bwa-0.7.9a.tar.bz2 && \
diff --git a/docker/passenger/Dockerfile b/docker/passenger/Dockerfile
index e6254bd..0201b49 100644
--- a/docker/passenger/Dockerfile
+++ b/docker/passenger/Dockerfile
@@ -4,11 +4,14 @@ FROM arvados/base
MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install packages and build the passenger apache module
-RUN apt-get update && \
- apt-get install -q -y apt-utils git curl procps apache2-mpm-worker \
- libcurl4-openssl-dev apache2-threaded-dev \
- libapr1-dev libaprutil1-dev && \
- cd /usr/src/arvados/services/api && \
+
+RUN apt-get update -qq
+RUN apt-get install -qqy \
+ apt-utils git curl procps apache2-mpm-worker \
+ libcurl4-openssl-dev apache2-threaded-dev \
+ libapr1-dev libaprutil1-dev
+
+RUN cd /usr/src/arvados/services/api && \
/usr/local/rvm/bin/rvm-exec default bundle exec passenger-install-apache2-module --auto
RUN cd /usr/src/arvados/services/api && \
diff --git a/docker/shell/Dockerfile b/docker/shell/Dockerfile
index 1e1c883..539ff94 100644
--- a/docker/shell/Dockerfile
+++ b/docker/shell/Dockerfile
@@ -3,9 +3,14 @@
FROM arvados/base
MAINTAINER Ward Vandewege <ward at curoverse.com>
-RUN apt-get update && apt-get -qqy install supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron vim
+RUN apt-get update -qq
+RUN apt-get install -qqy \
+ python-pip python-pyvcf python-gflags python-google-api-python-client \
+ python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse \
+ crunchstat python-arvados-fuse cron vim supervisor
ADD fuse.conf /etc/fuse.conf
+RUN chmod 644 /etc/fuse.conf
ADD generated/superuser_token /tmp/superuser_token
diff --git a/docker/slurm/Dockerfile b/docker/slurm/Dockerfile
index 7a60bf6..7e4284f 100644
--- a/docker/slurm/Dockerfile
+++ b/docker/slurm/Dockerfile
@@ -3,7 +3,8 @@
FROM arvados/base
MAINTAINER Ward Vandewege <ward at curoverse.com>
-RUN apt-get update && apt-get -q -y install slurm-llnl munge
+RUN apt-get update -qq
+RUN apt-get install -qqy slurm-llnl munge
ADD munge.key /etc/munge/
RUN chown munge:munge /etc/munge/munge.key && chmod 600 /etc/munge/munge.key
diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile
index 689f656..94d9f87 100644
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -4,7 +4,8 @@ FROM arvados/passenger
MAINTAINER Ward Vandewege <ward at curoverse.com>
# We need graphviz for the provenance graphs
-RUN apt-get update && apt-get -qqy install graphviz
+RUN apt-get update -qq
+RUN apt-get install -qqy graphviz
# Update Arvados source
RUN /bin/mkdir -p /usr/src/arvados/apps
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list