zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge branch 'master' into patch-1

This commit is contained in:
kadiix 2017-04-06 19:33:36 +02:00 committed by GitHub
parent 02c1ad5347 fa494dbb1d
commit f0d1107c53
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -5,3 +5,4 @@ public/assets
node_modules
storybook
neo4j
vendor/bundle

4
Dockerfile
View File

@ -5,7 +5,7 @@ ENV RAILS_ENV=production \
WORKDIR /mastodon
COPY . /mastodon
COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/
RUN BUILD_DEPS=" \
postgresql-dev \
@ -28,4 +28,6 @@ RUN BUILD_DEPS=" \
&& apk del $BUILD_DEPS \
&& rm -rf /tmp/* /var/cache/apk/*
COPY . /mastodon
VOLUME /mastodon/public/system /mastodon/public/assets