about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-03-07 01:57:31 +0100
committerGitHub <noreply@github.com>2018-03-07 01:57:31 +0100
commitd7573fe584ea622e22f5a68f2bf120b7682c49f7 (patch)
treecdb3130c695859ce7a5ebafc00711ab6a3855dbf /Dockerfile
parentcb74c0cfe4aa89f9656c054253665ef4965b41df (diff)
Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 377380a84..443cb289a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ruby:2.5.0-alpine3.7
 
 LABEL maintainer="https://github.com/tootsuite/mastodon" \
-      description="A GNU Social-compatible microblogging server"
+      description="Your self-hosted, globally interconnected microblogging community"
 
 ARG UID=991
 ARG GID=991
@@ -73,7 +73,9 @@ RUN addgroup -g ${GID} mastodon && adduser -h /mastodon -s /bin/sh -D -G mastodo
  && mkdir -p /mastodon/public/system /mastodon/public/assets /mastodon/public/packs \
  && chown -R mastodon:mastodon /mastodon/public
 
-COPY --chown=mastodon:mastodon . /mastodon
+COPY . /mastodon
+
+RUN chown -R mastodon:mastodon /mastodon
 
 VOLUME /mastodon/public/system /mastodon/public/assets /mastodon/public/packs