diff options
| author | kadiix <kadiix1997@gmail.Com> | 2017-04-06 19:33:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 19:33:36 +0200 |
| commit | f0d1107c530d43432f2e19a2c74aff6cdfbd2b83 (patch) | |
| tree | eb1a7097bd947ec74ca4ef2e54ad2506f95bf278 | |
| parent | 02c1ad5347747f15de86325e986308576bca1fd7 (diff) | |
| parent | fa494dbb1d51dad926dd9b95e333dce48c2a3891 (diff) | |
Merge branch 'master' into patch-1
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | Dockerfile | 4 |
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 |