diff --git a/.gitignore b/.gitignore index 2efefbd5a9a369f2438949bd60ea5684d4d87ce1..eba1ec580c094d0857c3bf11544e46cf93036c49 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ results.html .idea/ nbproject/ lib/aethyr/extensions/reactions/ +.bundle/ +vendor/ diff --git a/Dockerfile b/Dockerfile index d235bb59a8cad2e5adc4ce6f01ceaf981d9cdf7f..2ca6a06964a9038c13d0c5137be2478f779d2e82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,22 @@ -FROM ruby:2.6 +FROM archlinux/base -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 +RUN pacman -Sy --noconfirm +RUN pacman -S --noconfirm ruby git RUN gem install bundler +# throw errors if Gemfile has been modified since Gemfile.lock +RUN /root/.gem/ruby/2.7.0/bin/bundle config --global frozen 1 + WORKDIR /usr/src/app COPY . . RUN rm -rf storage && rm -rf lib/aethyr/extensions/reactions -RUN bundle install +RUN /root/.gem/ruby/2.7.0/bin/bundle install #RUN bundle update --bundler #cleanup RUN rm -rf .git EXPOSE 8888 -CMD ["bundle", "exec", "./bin/aethyr", "run"] +CMD ["/root/.gem/ruby/2.7.0/bin/bundle", "exec", "./bin/aethyr", "run"] diff --git a/README.rdoc b/README.rdoc index 87f74a61c42c2f8571f597e87db72de8580ad4d0..5575c37760b0e4e734108a6c3cba14e43171910f 100644 --- a/README.rdoc +++ b/README.rdoc @@ -26,7 +26,7 @@ Just run the application with the following command. == From source - bundle install + bundle install --path vendor/bundle bundle exec rake bundle exec ./bin/aethyr_setup bundle exec ./bin/aethyr run