Skip to content
Snippets Groups Projects
Commit f0d1107c authored by kadiix's avatar kadiix Committed by GitHub
Browse files

Merge branch 'master' into patch-1

parents 02c1ad53 fa494dbb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.dockerignore
+ 1
− 0
View file @ f0d1107c
......@@ -5,3 +5,4 @@ public/assets
node_modules
storybook
neo4j
vendor/bundle
Dockerfile
+ 3
− 1
View file @ f0d1107c
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment