X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4151af1d89da4c3f3fff3fb6732c0249d93dcda9..refs/heads/1904-wget-collections-wip:/docker/workbench/Dockerfile diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile index c59a654db8..bd0bf4551e 100644 --- a/docker/workbench/Dockerfile +++ b/docker/workbench/Dockerfile @@ -6,8 +6,13 @@ MAINTAINER Ward Vandewege # Update Arvados source RUN /bin/mkdir -p /usr/src/arvados/apps ADD generated/workbench.tar.gz /usr/src/arvados/apps/ +ADD generated/secret_token.rb /usr/src/arvados/apps/workbench/config/initializers/secret_token.rb +ADD generated/production.rb /usr/src/arvados/apps/workbench/config/environments/production.rb +ADD passenger.conf /etc/apache2/conf.d/passenger + -RUN touch /usr/src/arvados/apps/workbench/log/production.log && \ +RUN bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \ + touch /usr/src/arvados/apps/workbench/log/production.log && \ chmod 666 /usr/src/arvados/apps/workbench/log/production.log && \ touch /usr/src/arvados/apps/workbench/db/production.sqlite3 && \ bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \ @@ -22,11 +27,6 @@ RUN \ a2ensite workbench && \ a2enmod rewrite -# Set up the production environment -ADD generated/secret_token.rb /usr/src/arvados/apps/workbench/config/initializers/secret_token.rb -ADD generated/production.rb /usr/src/arvados/apps/workbench/config/environments/production.rb -ADD passenger.conf /etc/apache2/conf.d/passenger - ADD apache2_foreground.sh /etc/apache2/foreground.sh # Start Apache