mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)

Browse Source 
Fix #6605
This commit is contained in:
Eugen Rochko 2018-03-07 01:57:31 +01:00 committed by GitHub
parent cb74c0cfe4
commit d7573fe584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -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

6
docker-compose.yml
View File

@ -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