浏览代码

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

Fix #6605
master
Eugen Rochko 6 年前
committed by GitHub
父节点
当前提交
d7573fe584
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改,包括 7 次插入5 次删除
  1. +4
    -2
      Dockerfile
  2. +3
    -3
      docker-compose.yml

+ 4
- 2
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



+ 3
- 3
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


正在加载...
取消
保存