Merge branch 'master' into patch-1

8 years ago · 7006cbe5e1
parent 81bb50a15b 513456fa36
commit 7006cbe5e1
2 changed files with 4 additions and 1 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -5,3 +5,4 @@ public/assets
 node_modules
 storybook
 neo4j
+vendor/bundle
--- a/4
+++ b/4
@ -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