Fix #6605master
@@ -1,7 +1,7 @@ | |||||
FROM ruby:2.5.0-alpine3.7 | FROM ruby:2.5.0-alpine3.7 | ||||
LABEL maintainer="https://github.com/tootsuite/mastodon" \ | 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 UID=991 | ||||
ARG GID=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 \ | && mkdir -p /mastodon/public/system /mastodon/public/assets /mastodon/public/packs \ | ||||
&& chown -R mastodon:mastodon /mastodon/public | && 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 | VOLUME /mastodon/public/system /mastodon/public/assets /mastodon/public/packs | ||||
@@ -32,7 +32,7 @@ services: | |||||
web: | web: | ||||
build: . | build: . | ||||
image: gargron/mastodon | |||||
image: tootsuite/mastodon | |||||
restart: always | restart: always | ||||
env_file: .env.production | env_file: .env.production | ||||
command: bundle exec rails s -p 3000 -b '0.0.0.0' | command: bundle exec rails s -p 3000 -b '0.0.0.0' | ||||
@@ -52,7 +52,7 @@ services: | |||||
streaming: | streaming: | ||||
build: . | build: . | ||||
image: gargron/mastodon | |||||
image: tootsuite/mastodon | |||||
restart: always | restart: always | ||||
env_file: .env.production | env_file: .env.production | ||||
command: yarn start | command: yarn start | ||||
@@ -67,7 +67,7 @@ services: | |||||
sidekiq: | sidekiq: | ||||
build: . | build: . | ||||
image: gargron/mastodon | |||||
image: tootsuite/mastodon | |||||
restart: always | restart: always | ||||
env_file: .env.production | env_file: .env.production | ||||
command: bundle exec sidekiq -q default -q mailers -q pull -q push | command: bundle exec sidekiq -q default -q mailers -q pull -q push | ||||