fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-23 01:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update doorkeeper dependency and replace libav with backported ffmpeg in docker

Browse source
This commit is contained in:
Eugen Rochko 2016-09-17 18:24:58 +02:00
parent 5342629a0a
commit 18d21f1a39
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -2,7 +2,8 @@ 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 libxml2-dev libxslt1-dev nodejs nodejs-legacy npm libav-tools && rm -rf /var/lib/apt/lists/* RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main contrib non-free' >> /etc/apt/sources.list
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libxml2-dev libxslt1-dev nodejs nodejs-legacy npm ffpmeg && rm -rf /var/lib/apt/lists/*
RUN mkdir /mastodon RUN mkdir /mastodon
WORKDIR /mastodon WORKDIR /mastodon

2
Gemfile.lock
View file

@ -101,7 +101,7 @@ GEM
docile (1.1.5) docile (1.1.5)
domain_name (0.5.20160615) domain_name (0.5.20160615)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.1.0) doorkeeper (4.2.0)
railties (>= 4.2) railties (>= 4.2)
dotenv (2.1.1) dotenv (2.1.1)
dotenv-rails (2.1.1) dotenv-rails (2.1.1)