X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e7bb8d8e68f80b8b8c22038beee23536c5b768b3..e1e4dd922cc2d2bc9890222cc3aeffce7a00fcda:/docker/base/Dockerfile

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 8044e5d404..c325484a02 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -1,60 +1,22 @@
-# Arvados base image (wheezy+rvm+rails+Arvados source) in Docker
+# Arvados base image (wheezy+rvm+Arvados source) in Docker
 
 # Based on Debian Wheezy
 FROM arvados/debian:wheezy
 MAINTAINER Tim Pierce <twp@clinicalfuture.com>
 
-# TODO(twp): parameterize variables via autoconf or similar.
-ENV RUBY_VERSION_NUM   2.0.0
-ENV POSTGRES_ROOT_PW   dummy_pw
-
-ENV ARVADOS_DEV_DB     arvados_development
-ENV ARVADOS_DEV_USER   arvados
-ENV ARVADOS_DEV_PW     dummy_pw
-
-ENV ARVADOS_TEST_DB    arvados_test
-ENV ARVADOS_TEST_USER  arvados
-ENV ARVADOS_TEST_PW    dummy_pw
-
-ENV ARVADOS_PROD_DB    arvados_production
-ENV ARVADOS_PROD_USER  arvados
-ENV ARVADOS_PROD_PW    dummy_pw
-
 # Install prerequisite packages for Arvados
-RUN apt-get update
-RUN apt-get -q -y install -q -y apt-utils
-RUN apt-get -q -y install git curl procps postgresql postgresql-server-dev-9.1 apache2
-RUN curl -L https://get.rvm.io | bash -s stable --ruby=${RUBY_VERSION_NUM}
+#   * git, curl, rvm
+#   * Arvados source code
+#
+RUN apt-get update && \
+    apt-get -q -y install -q -y apt-utils && \
+    apt-get -q -y install git curl && \
+    git clone git://github.com/clinicalfuture/arvados.git /usr/src/arvados && \
+    curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0
 
 # 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.
 # TODO(twp): figure out a less awful solution.
-ENV RUBY_VERSION ruby-2.0.0-p247
-ENV MY_RUBY_HOME /usr/local/rvm/rubies/ruby-2.0.0-p247
 ENV GEM_HOME /usr/local/rvm/gems/ruby-2.0.0-p247
 ENV GEM_PATH /usr/local/rvm/gems/ruby-2.0.0-p247:/usr/local/rvm/gems/ruby-2.0.0-p247@global
-ENV IRBRC /usr/local/rvm/rubies/ruby-2.0.0-p247/.irbrc
-ENV rvm_path /usr/local/rvm
-ENV rvm_prefix /usr/local
-ENV rvm_env_string ruby-2.0.0-p247
-ENV rvm_version 1.23.13 (stable)
-ENV rvm_ruby_string ruby-2.0.0-p247
 ENV PATH /usr/local/rvm/gems/ruby-2.0.0-p247/bin:/usr/local/rvm/gems/ruby-2.0.0-p247@global/bin:/usr/local/rvm/rubies/ruby-2.0.0-p247/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-# Download Arvados source.
-RUN git clone git://github.com/clinicalfuture/arvados.git /usr/src/arvados
-
-# Install gems
-RUN bundle install --gemfile=/usr/src/arvados/services/api/Gemfile
-
-# Configure databases and users.
-ADD postgresql_config.sh /tmp/postgresql_config.sh
-RUN /tmp/postgresql_config.sh
-
-# Finish configuration. The remaining steps need PostgreSQL to be running,
-# so they are done in a single step.
-ENV RAILS_ENV production
-ADD database.yml /usr/src/arvados/services/api/config/database.yml
-ADD config_rake.sh /tmp/config_rake.sh
-RUN /tmp/config_rake.sh
-