Minor simplifications on docker and opbeat
parent
b8a51dda47
commit
6fa7dc9e00
|
@ -2,5 +2,6 @@
|
||||||
|
|
||||||
find ./staticfiles -mindepth 1 -not -name '.gitkeep'| xargs rm -rf
|
find ./staticfiles -mindepth 1 -not -name '.gitkeep'| xargs rm -rf
|
||||||
./manage.py collectstatic --noinput
|
./manage.py collectstatic --noinput
|
||||||
|
./manage.py compress --force
|
||||||
./manage.py migrate --noinput
|
./manage.py migrate --noinput
|
||||||
./manage.py runserver 0.0.0.0:8000
|
./manage.py runserver 0.0.0.0:8000
|
||||||
|
|
|
@ -28,17 +28,19 @@ THIRD_PARTY_APPS = (
|
||||||
'crispy_forms',
|
'crispy_forms',
|
||||||
'compressor',
|
'compressor',
|
||||||
'csp',
|
'csp',
|
||||||
'opbeat.contrib.django',
|
|
||||||
)
|
)
|
||||||
LOCAL_APPS = (
|
LOCAL_APPS = (
|
||||||
'db.base',
|
'db.base',
|
||||||
'db.api',
|
'db.api',
|
||||||
)
|
)
|
||||||
|
|
||||||
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
|
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
|
||||||
|
if ENVIRONMENT == 'production':
|
||||||
|
INSTALLED_APPS += (
|
||||||
|
'opbeat.contrib.django',
|
||||||
|
)
|
||||||
|
|
||||||
# Middlware
|
# Middlware
|
||||||
MIDDLEWARE_CLASSES = (
|
MIDDLEWARE = (
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
|
@ -46,9 +48,12 @@ MIDDLEWARE_CLASSES = (
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'csp.middleware.CSPMiddleware',
|
'csp.middleware.CSPMiddleware',
|
||||||
'opbeat.contrib.django.middleware.OpbeatAPMMiddleware',
|
|
||||||
'opbeat.contrib.django.middleware.Opbeat404CatchMiddleware',
|
|
||||||
)
|
)
|
||||||
|
if ENVIRONMENT == 'production':
|
||||||
|
MIDDLEWARE += (
|
||||||
|
'opbeat.contrib.django.middleware.OpbeatAPMMiddleware',
|
||||||
|
'opbeat.contrib.django.middleware.Opbeat404CatchMiddleware',
|
||||||
|
)
|
||||||
|
|
||||||
# Email
|
# Email
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
|
|
|
@ -1,36 +1,41 @@
|
||||||
version: '3'
|
version: '3.1'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: mariadb:5.5
|
image: mariadb:5.5
|
||||||
|
container_name: satnogs_db_mysql
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=satnogsdb
|
- MYSQL_DATABASE=satnogsdb
|
||||||
- MYSQL_USER=satnogsdb
|
- MYSQL_USER=satnogsdb
|
||||||
- MYSQL_PASSWORD=satnogsdb
|
- MYSQL_PASSWORD=satnogsdb
|
||||||
- MYSQL_ROOT_PASSWORD=toor
|
- MYSQL_ROOT_PASSWORD=toor
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:3.2.8
|
image: redis:3.2.8
|
||||||
|
container_name: satnogs_db_redis
|
||||||
|
|
||||||
celery:
|
celery:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: docker/dev
|
dockerfile: docker/dev
|
||||||
|
container_name: satnogs_db_celery
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
links:
|
links:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
environment:
|
environment:
|
||||||
- ENVIRONMENT=dev
|
|
||||||
- DEBUG=True
|
|
||||||
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
||||||
- CACHE_BACKEND=redis_cache.RedisCache
|
- CELERY_BROKER_URL=redis://redis:6379/0
|
||||||
- CACHE_LOCATION=redis://redis:6379/1
|
- CELERY_RESULT_BACKEND=redis://redis:6379/0
|
||||||
- CACHE_CLIENT_CLASS=django_redis.client.DefaultClient
|
|
||||||
command:
|
command:
|
||||||
./bin/run-celery.sh
|
./bin/run-celery.sh
|
||||||
|
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: docker/dev
|
dockerfile: docker/dev
|
||||||
|
container_name: satnogs_db_web
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -38,13 +43,7 @@ services:
|
||||||
links:
|
links:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
- celery
|
|
||||||
environment:
|
environment:
|
||||||
- ENVIRONMENT=dev
|
|
||||||
- DEBUG=True
|
|
||||||
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
||||||
- CACHE_BACKEND=redis_cache.RedisCache
|
|
||||||
- CACHE_LOCATION=redis://redis:6379/1
|
|
||||||
- CACHE_CLIENT_CLASS=django_redis.client.DefaultClient
|
|
||||||
command:
|
command:
|
||||||
./bin/run-web.sh
|
./bin/run-web.sh
|
||||||
|
|
Loading…
Reference in New Issue