diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-24 18:51:36 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-24 18:51:36 +0200 |
| commit | 03f5ffcd06ba82103327468b1bc6fe9127af8e13 (patch) | |
| tree | e7a9cf9128c60fb99f5543bf8ee0a30fbebfd761 | |
| parent | 49520d6e627e49a1f9f1b8cfa9b323450307fcc6 (diff) | |
Dockerfile adjustments
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/cable.js | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.dockerignore b/.dockerignore index de0577641..3357e5b8d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,3 +2,4 @@ .env.* public/system public/assets +node_modules diff --git a/Dockerfile b/Dockerfile index bb4c70d87..2b15d437b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,17 @@ FROM ruby:2.2.4 ENV RAILS_ENV=production -RUN apt-get update -qq && apt-get install -y build-essential libpq-dev && rm -rf /var/lib/apt/lists/* +RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libxml2-dev libxslt1-dev nodejs nodejs-legacy npm && rm -rf /var/lib/apt/lists/* RUN mkdir /mastodon WORKDIR /mastodon ADD Gemfile /mastodon/Gemfile ADD Gemfile.lock /mastodon/Gemfile.lock +ADD package.json /mastodon/package.json -RUN bundle install --deployment --without test --without development +RUN bundle install --deployment --without test development +RUN npm install ADD . /mastodon diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js index 71ee1e66d..03258761c 100644 --- a/app/assets/javascripts/cable.js +++ b/app/assets/javascripts/cable.js @@ -3,7 +3,6 @@ // //= require action_cable //= require_self -//= require_tree ./channels (function() { this.App || (this.App = {}); |