Merge branch '2096-demo-feedback'

[arvados.git] / docker / base / Dockerfile

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index cd8268d0f594701800facbe1087e774699b31191..66fa89e9c27b3a725c44bc4af60ae156faf0e5bb 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -2,7 +2,7 @@
 
 # Based on Debian Wheezy
 FROM arvados/debian:wheezy
-MAINTAINER Tim Pierce <twp@clinicalfuture.com>
+MAINTAINER Tim Pierce <twp@curoverse.com>
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -10,12 +10,13 @@ ENV DEBIAN_FRONTEND noninteractive
 #   * git, curl, rvm
 #   * Arvados source code in /usr/src/arvados-upstream, for preseeding gem installation
 
-RUN apt-get update ;\
-    apt-get -q -y install -q -y apt-utils git curl locales postgresql-server-dev-9.1 ;\
-    /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen ;\
-    /usr/sbin/locale-gen ;\
-    curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0 ;\
-    git clone https://github.com/clinicalfuture/arvados.git /usr/src/arvados-upstream
+RUN apt-get update && \
+    apt-get -q -y install -q -y openssh-server apt-utils git curl locales postgresql-server-dev-9.1 && \
+    /bin/mkdir -p /root/.ssh && \
+    /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    /usr/sbin/locale-gen && \
+    curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0 && \
+    git clone https://github.com/curoverse/arvados.git /usr/src/arvados-upstream
 
 # Set up RVM environment. These are just the env variables created by
 # /usr/local/rvm/scripts/rvm, which can't be run from a non-login shell.
@@ -26,10 +27,11 @@ ENV PATH /usr/local/rvm/gems/ruby-2.0.0-p353/bin:/usr/local/rvm/gems/ruby-2.0.0-
 
 # Update gem. This (hopefully) fixes
 # https://github.com/rubygems/rubygems.org/issues/613.
-RUN gem update --system 
-
-RUN gem install bundler ;\
-    bundle install --gemfile=/usr/src/arvados-upstream/apps/workbench/Gemfile ;\
-    bundle install --gemfile=/usr/src/arvados-upstream/services/api/Gemfile ;\
+RUN gem update --system && \
+    gem install bundler && \
+    bundle install --gemfile=/usr/src/arvados-upstream/apps/workbench/Gemfile && \
+    bundle install --gemfile=/usr/src/arvados-upstream/services/api/Gemfile && \
     bundle install --gemfile=/usr/src/arvados-upstream/doc/Gemfile
 
+ADD generated/id_rsa.pub /root/.ssh/authorized_keys
+RUN chown root:root /root/.ssh/authorized_keys