Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
d7573fe5
Unverified
Commit
d7573fe5
authored
7 years ago
by
Eugen Rochko
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
parent
cb74c0cf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+4
-2
4 additions, 2 deletions
Dockerfile
docker-compose.yml
+3
-3
3 additions, 3 deletions
docker-compose.yml
with
7 additions
and
5 deletions
Dockerfile
+
4
−
2
View file @
d7573fe5
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
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
3
−
3
View file @
d7573fe5
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment