Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Mastodon
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
libre.sh
compose
Mastodon
Commits
2c6c8653
Commit
2c6c8653
authored
7 years ago
by
Pierre Ozoux
Browse files
Options
Downloads
Patches
Plain Diff
Fix docker-compose
parent
30ebf000
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker-compose.yml
+8
-9
8 additions, 9 deletions
docker-compose.yml
with
8 additions
and
9 deletions
docker-compose.yml
+
8
−
9
View file @
2c6c8653
...
@@ -10,6 +10,8 @@ services:
...
@@ -10,6 +10,8 @@ services:
image
:
postgres:alpine
image
:
postgres:alpine
networks
:
networks
:
-
back
-
back
volumes
:
-
./data/postgres:/var/lib/postgresql/data
redis
:
redis
:
restart
:
always
restart
:
always
image
:
redis:alpine
image
:
redis:alpine
...
@@ -18,7 +20,7 @@ services:
...
@@ -18,7 +20,7 @@ services:
web
:
web
:
image
:
nginx
image
:
nginx
volumes
:
volumes
:
-
./nginx.conf:/etc/nginx/nginx.co
m
f
-
./nginx.conf:/etc/nginx/nginx.co
n
f
volumes_from
:
volumes_from
:
-
app
-
app
depends_on
:
depends_on
:
...
@@ -27,12 +29,11 @@ services:
...
@@ -27,12 +29,11 @@ services:
networks
:
networks
:
-
back
-
back
-
lb_web
-
lb_web
env
:
env
ironment
:
-
VIRTUAL_HOST
-
VIRTUAL_HOST
app
:
app
:
restart
:
always
restart
:
always
build
:
.
image
:
gargron/mastodon
image
:
tootsuite/mastodon
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'
depends_on
:
depends_on
:
...
@@ -41,12 +42,12 @@ services:
...
@@ -41,12 +42,12 @@ services:
volumes
:
volumes
:
-
./public/assets:/mastodon/public/assets
-
./public/assets:/mastodon/public/assets
-
./public/system:/mastodon/public/system
-
./public/system:/mastodon/public/system
-
/mastodon/public
networks
:
networks
:
-
back
-
back
streaming
:
streaming
:
restart
:
always
restart
:
always
build
:
.
image
:
gargron/mastodon
image
:
tootsuite/mastodon
env_file
:
.env.production
env_file
:
.env.production
command
:
npm run start
command
:
npm run start
depends_on
:
depends_on
:
...
@@ -56,8 +57,7 @@ services:
...
@@ -56,8 +57,7 @@ services:
-
back
-
back
sidekiq
:
sidekiq
:
restart
:
always
restart
:
always
build
:
.
image
:
gargron/mastodon
image
:
tootsuite/mastodon
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
depends_on
:
depends_on
:
...
@@ -67,4 +67,3 @@ services:
...
@@ -67,4 +67,3 @@ services:
-
./public/system:/mastodon/public/system
-
./public/system:/mastodon/public/system
networks
:
networks
:
-
back
-
back
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