Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
This commit is contained in:
		| @ -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 | ||||
|  | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
		Reference in New Issue
	
	Block a user