Merge branch 'fixed-entrypoint' into 'develop' (55a93c71) · Commits · Zwordi / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

55a93c71

Commit 55a93c71 authored 7 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'fixed-entrypoint' into 'develop'

More generic entrypoint to work with non-compose setups

See merge request funkwhale/funkwhale!78

parents b7d35c6a 968423a6

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

api/compose/django/entrypoint.sh 9 additions, 6 deletions

api/compose/django/entrypoint.sh
api/config/settings/common.py 1 addition, 1 deletion

api/config/settings/common.py
deploy/docker-compose.yml 1 addition, 1 deletion

deploy/docker-compose.yml
deploy/env.prod.sample 4 additions, 1 deletion

deploy/env.prod.sample
deploy/funkwhale-server.service 1 addition, 1 deletion

deploy/funkwhale-server.service
deploy/funkwhale-worker.service 1 addition, 1 deletion

deploy/funkwhale-worker.service
docs/configuration.rst 35 additions, 0 deletions

docs/configuration.rst
docs/index.rst 1 addition, 0 deletions

docs/index.rst
docs/installation/external_dependencies.rst 9 additions, 0 deletions

docs/installation/external_dependencies.rst

with 62 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment