Browse Source

Dockerfile adjustments

master
Eugen Rochko 7 years ago
parent
commit
03f5ffcd06
3 changed files with 5 additions and 3 deletions
  1. +1
    -0
      .dockerignore
  2. +4
    -2
      Dockerfile
  3. +0
    -1
      app/assets/javascripts/cable.js

+ 1
- 0
.dockerignore View File

@@ -2,3 +2,4 @@
.env.* .env.*
public/system public/system
public/assets public/assets
node_modules

+ 4
- 2
Dockerfile View File

@@ -2,15 +2,17 @@ FROM ruby:2.2.4


ENV RAILS_ENV=production 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 RUN mkdir /mastodon


WORKDIR /mastodon WORKDIR /mastodon


ADD Gemfile /mastodon/Gemfile ADD Gemfile /mastodon/Gemfile
ADD Gemfile.lock /mastodon/Gemfile.lock 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 ADD . /mastodon




+ 0
- 1
app/assets/javascripts/cable.js View File

@@ -3,7 +3,6 @@
// //
//= require action_cable //= require action_cable
//= require_self //= require_self
//= require_tree ./channels


(function() { (function() {
this.App || (this.App = {}); this.App || (this.App = {});


Loading…
Cancel
Save