From 2d7610520e4d1ab289899821bf4d885b77a1e327 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 2 Jul 2014 10:52:41 -0400 Subject: [PATCH] Use 'install' to create /keep, /tmp/crunch-src, /tmp/crunch-job mountpoints in the docker image. Changed some commands to use long command line parameters for readability. --- docker/bcbio-nextgen/Dockerfile | 20 ++++++++++---------- docker/jobs/Dockerfile | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/bcbio-nextgen/Dockerfile b/docker/bcbio-nextgen/Dockerfile index 436aa9c1c4..e3e705b04d 100644 --- a/docker/bcbio-nextgen/Dockerfile +++ b/docker/bcbio-nextgen/Dockerfile @@ -3,28 +3,28 @@ MAINTAINER Peter Amstutz USER root -RUN apt-get remove -q -y ruby && \ +ADD generated/arvados.tar.gz /usr/src/arvados/ +ENV GEM_HOME /usr/local/rvm/gems/ruby-2.1.0 +ENV GEM_PATH /usr/local/rvm/gems/ruby-2.1.0:/usr/local/rvm/gems/ruby-2.1.0@global +ENV PATH /usr/local/rvm/gems/ruby-2.1.0/bin:/usr/local/rvm/gems/ruby-2.1.0@global/bin:/usr/local/rvm/rubies/ruby-2.1.0/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + +# Install Ruby 2.1.0 +RUN apt-get remove --quiet --assume-yes ruby && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.1.0 && \ /bin/mkdir -p /usr/src/arvados -ADD generated/arvados.tar.gz /usr/src/arvados/ - # Install dependencies and set up system. # The FUSE packages help ensure that we can install the Python SDK (arv-mount). -RUN /usr/bin/apt-get update && \ - /usr/bin/apt-get install -q -y python-dev python-llfuse python-pip \ +RUN /usr/bin/apt-get update && \ + /usr/bin/apt-get install --quiet --assume-yes python-dev python-llfuse python-pip \ libio-socket-ssl-perl libjson-perl liburi-perl libwww-perl \ fuse libattr1-dev libfuse-dev && \ /usr/sbin/adduser --disabled-password \ --gecos 'Crunch execution user' crunch && \ - /usr/bin/install -d -o crunch -g crunch -m 0700 /tmp/crunch-job && \ + /usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job && \ /bin/ln -s /usr/src/arvados /usr/local/src/arvados -ENV GEM_HOME /usr/local/rvm/gems/ruby-2.1.0 -ENV GEM_PATH /usr/local/rvm/gems/ruby-2.1.0:/usr/local/rvm/gems/ruby-2.1.0@global -ENV PATH /usr/local/rvm/gems/ruby-2.1.0/bin:/usr/local/rvm/gems/ruby-2.1.0@global/bin:/usr/local/rvm/rubies/ruby-2.1.0/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - # Install Arvados packages. RUN gem update --system && \ find /usr/src/arvados/sdk -name '*.gem' -print0 | \ diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile index 29c9d540b5..2cad65c527 100644 --- a/docker/jobs/Dockerfile +++ b/docker/jobs/Dockerfile @@ -8,12 +8,12 @@ RUN /usr/bin/apt-get install -q -y python-dev python-llfuse python-pip \ fuse libattr1-dev libfuse-dev && \ /usr/sbin/adduser --disabled-password \ --gecos 'Crunch execution user' crunch && \ - /usr/bin/install -d -o crunch -g crunch -m 0700 /tmp/crunch-job && \ + /usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job && \ /bin/ln -s /usr/src/arvados /usr/local/src/arvados # Install Arvados packages. -RUN find /usr/src/arvados/sdk -name '*.gem' -print0 | \ - xargs -0rn 1 gem install && \ +RUN (find /usr/src/arvados/sdk -name '*.gem' -print0 | \ + xargs -0rn 1 gem install) && \ cd /usr/src/arvados/services/fuse && \ python setup.py install && \ cd /usr/src/arvados/sdk/python && \ -- 2.30.2