diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-07 01:57:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 01:57:31 +0100 |
| commit | d7573fe584ea622e22f5a68f2bf120b7682c49f7 (patch) | |
| tree | cdb3130c695859ce7a5ebafc00711ab6a3855dbf | |
| parent | cb74c0cfe4aa89f9656c054253665ef4965b41df (diff) | |
Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | docker-compose.yml | 6 |
2 files changed, 7 insertions, 5 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 diff --git a/docker-compose.yml b/docker-compose.yml index 4d9a6c40d..836cb00b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: web: build: . - image: gargron/mastodon + image: tootsuite/mastodon restart: always env_file: .env.production command: bundle exec rails s -p 3000 -b '0.0.0.0' @@ -52,7 +52,7 @@ services: streaming: build: . - image: gargron/mastodon + image: tootsuite/mastodon restart: always env_file: .env.production command: yarn start @@ -67,7 +67,7 @@ services: sidekiq: build: . - image: gargron/mastodon + image: tootsuite/mastodon restart: always env_file: .env.production command: bundle exec sidekiq -q default -q mailers -q pull -q push |