Dockerfile adjustments

diff --git a/.dockerignore b/.dockerignore
index de057764138cfcad9d112b1c15af3e25be787194..3357e5b8dd0b6605636ca1628cd3813948d05e99 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,4 @@
 .env.*
 public/system
 public/assets
+node_modules

diff --git a/Dockerfile b/Dockerfile
index bb4c70d87cae645bcb96f3e530ebb96596248a52..2b15d437be553cd45856810cb8c91e131dd2eb17 100644 (file)
--- 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 71ee1e66de2ca69297c0e3434f452b3a09e26e9c..03258761ca86ddcc2382603fd49ecb1bf39f3556 100644 (file)
--- 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 = {});