Renamed fw_config.env.example to funkwhale.env.example and updated docker-compose.yml

master
Meliurwen 4 years ago
parent f2532fbf5a
commit 8150782067
Signed by: meliurwen
GPG Key ID: 818A8B35E9F1CE10
  1. 4
      .env.example
  2. 6
      docker-compose.yml
  3. 0
      funkwhale.env.example

@ -22,11 +22,13 @@ FUNKWHALE_VERSION=
# Networks # Networks
# Name of the external network of the reverse proxy # Name of the external network of the reverse proxy
REVERSE_PROXY_NETWORK=webservices REVERSE_PROXY_NETWORK=webservices
# Networks (optional)
# Restrict internet access to the whole Funkwhale app # Restrict internet access to the whole Funkwhale app
# Note: It will be normally reachable from the web (via the reverse-proxy), but # Note: It will be normally reachable from the web (via the reverse-proxy), but
# the containers cannot make external calls on their own, thus no # the containers cannot make external calls on their own, thus no
# federation or anything that may require internet from the server side. # federation or anything that may require internet from the server side.
NO_INTERNET_ACC=false NO_INTERNET_ACC=true
# postgres (optional) # postgres (optional)
DB_IMG= DB_IMG=

@ -35,7 +35,7 @@ services:
- "${HOST_MUSIC_DIRECTORY_PATH}:/data/music:ro" - "${HOST_MUSIC_DIRECTORY_PATH}:/data/music:ro"
- "${HOST_MEDIA_ROOT}:/data/media" - "${HOST_MEDIA_ROOT}:/data/media"
env_file: env_file:
- fw_config.env - funkwhale.env
- paths.env - paths.env
environment: environment:
- C_FORCE_ROOT=true - C_FORCE_ROOT=true
@ -50,7 +50,7 @@ services:
- postgres - postgres
- redis - redis
env_file: env_file:
- fw_config.env - funkwhale.env
environment: environment:
- FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME} # This is necessary - FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME} # This is necessary
command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
@ -73,7 +73,7 @@ services:
expose: expose:
- 5000 - 5000
env_file: env_file:
- fw_config.env - funkwhale.env
- paths.env - paths.env
environment: environment:
- FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME} - FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME}

Loading…
Cancel
Save