about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-06 19:32:50 +0200
committerGitHub <noreply@github.com>2017-04-06 19:32:50 +0200
commitfa494dbb1d51dad926dd9b95e333dce48c2a3891 (patch)
treef64f512481d275979347a8b206d19e269195119b
parentc392c54271d605ed3176d5f20eaca36048d1682b (diff)
parenta2637c17200f9dd2eea9e130368cea87076823c7 (diff)
Merge pull request #1038 from wade-r/optimize-dockerfile
Optimize Dockerfile
-rw-r--r--.dockerignore1
-rw-r--r--Dockerfile4
2 files changed, 4 insertions, 1 deletions
diff --git a/.dockerignore b/.dockerignore
index 7892e503c..21d1f59a1 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,3 +5,4 @@ public/assets
 node_modules
 storybook
 neo4j
+vendor/bundle
diff --git a/Dockerfile b/Dockerfile
index bcc911343..f5eb08893 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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