From f9c649472a627429967370bf5b5203627661d61f Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 31 Mar 2018 13:20:42 +0200
Subject: [PATCH] Moved duplicated dev variables to env file
---
.env.dev | 6 ++++++
dev.yml | 10 ----------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.env.dev b/.env.dev
index 9923c31487..2e88341436 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,3 +1,9 @@
API_AUTHENTICATION_REQUIRED=True
RAVEN_ENABLED=false
RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f716@sentry.eliotberriot.com/5
+DJANGO_ALLOWED_HOSTS=localhost,nginx
+DJANGO_SETTINGS_MODULE=config.settings.local
+DJANGO_SECRET_KEY=dev
+C_FORCE_ROOT=true
+FUNKWHALE_URL=http://localhost
+PYTHONDONTWRITEBYTECODE=true
diff --git a/dev.yml b/dev.yml
index 126efa683e..c0470a2ab6 100644
--- a/dev.yml
+++ b/dev.yml
@@ -38,13 +38,8 @@ services:
- redis
command: celery -A funkwhale_api.taskapp worker -l debug
environment:
- - "DJANGO_ALLOWED_HOSTS=localhost"
- - "DJANGO_SETTINGS_MODULE=config.settings.local"
- - "DJANGO_SECRET_KEY=dev"
- - C_FORCE_ROOT=true
- "DATABASE_URL=postgresql://postgres@postgres/postgres"
- "CACHE_URL=redis://redis:6379/0"
- - "FUNKWHALE_URL=http://localhost"
volumes:
- ./api:/app
- ./data/music:/music
@@ -60,13 +55,8 @@ services:
- ./api:/app
- ./data/music:/music
environment:
- - "PYTHONDONTWRITEBYTECODE=true"
- - "DJANGO_ALLOWED_HOSTS=localhost,nginx"
- - "DJANGO_SETTINGS_MODULE=config.settings.local"
- - "DJANGO_SECRET_KEY=dev"
- "DATABASE_URL=postgresql://postgres@postgres/postgres"
- "CACHE_URL=redis://redis:6379/0"
- - "FUNKWHALE_URL=http://localhost"
links:
- postgres
- redis
--
GitLab