diff --git a/.env b/.env index b30d768..ff5aefa 100644 --- a/.env +++ b/.env @@ -2,7 +2,6 @@ REDIS_HOST=radarsys-redis REDIS_PORT=6300 POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres -# POSTGRES_PORT_5432_TCP_PORT=5400 POSTGRES_PORT_5432_TCP_PORT=5432 #POSTGRES_HOST=postgres POSTGRES_HOST=localhost diff --git a/apps/atrad/migrations/__init__.py b/apps/atrad/migrations/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/apps/atrad/migrations/__init__.py diff --git a/docker-compose.yml b/docker-compose.yml index 51f2111..070545f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,42 +6,19 @@ services: build: . restart: always image: radarsys - #command: gunicorn radarsys.wsgi:application -w 2 -b :8000 - #command: python manage.py runserver 0.0.0.0:8000 ports: - 8000:8000 - #ports: - # - 8030:8030 env_file: .env - links: - # - redis - postgres volumes: - './:/radarsys' - '${DOCKER_DATA}/static:/radarsys/static' depends_on: - # - redis - postgres - # redis: - # container_name: 'radarsys-redis' - # image: 'redis:3.2-alpine' - # volumes: - # - '${DOCKER_DATA}/redis:/data' - - # celery_worker: - # container_name: 'radarsys-celery' - # image: radarsys - # env_file: .env - # command: celery -A radarsys worker -l info - # volumes_from: - # - web - # depends_on: - # - web - # PostgreSQL - postgres: + radarsys-postgres: container_name: 'radarsys-postgres' build: ./postgres/ volumes: @@ -49,7 +26,7 @@ services: - pgdata:/var/lib/postgresql/data ports: - 5432:5432 - env_file: .env + env_file: .env #Web Server radarsys-nginx: diff --git a/entrypoint.sh b/entrypoint.sh index 76aa610..7645063 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -9,4 +9,4 @@ python3 manage.py collectstatic --no-input #DJANGO_SUPERUSER_PASSWORD=$SUPER_USER_PASSWORD python manage.py createsuperuser --username $SUPER_USER_NAME --email $SUPER_USER_EMAIL --noinput gunicorn -k eventlet radarsys.wsgi:application --bind 0.0.0.0:8000 - \ No newline at end of file + \ No newline at end of file