diff --git a/Dockerfile b/Dockerfile index 2c3b3a9..7281fa5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,14 +4,21 @@ FROM python:2.7.11 RUN mkdir /radarsys WORKDIR /radarsys -# Copy the main application. -COPY . ./ - # Install python dependences +ADD requirements.txt ./requirements.txt RUN pip install -v --timeout 120 -r requirements.txt --no-cache-dir -EXPOSE 3000 +# Copy the main application. +COPY . ./ +#RUN mkdir /radarsys media +# RUN python manage.py makemigrations \ +# && python manage.py migrate \ +# && python manage.py loaddata apps/main/fixtures/main_initial_data.json \ +# && python manage.py loaddata apps/rc/fixtures/rc_initial_data.json \ +# && python manage.py loaddata apps/jars/fixtures/initial_filters_data.json \ +RUN python manage.py collectstatic --noinput +#EXPOSE 3000 # CMD ["python", "manage.py", "runserver", "0.0.0.0:3000"] # Para produccion: -CMD ["gunicorn", "radarsys.wsgi:application", "--bind", "0.0.0.0:3000"] +#CMD ["gunicorn", "radarsys.wsgi:application", "--bind", "0.0.0.0:3000"] diff --git a/radarsys/settings.py b/radarsys/settings.py index 39e6bcb..bd1990b 100644 --- a/radarsys/settings.py +++ b/radarsys/settings.py @@ -90,7 +90,7 @@ DATABASES = { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'radarsys', 'USER': 'developer', - #'HOST': 'mysql-radarsys-server', + #'HOST': 'mysql', 'PASSWORD': 'idi2015', 'OPTIONS': { 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'", @@ -140,9 +140,16 @@ FIXTURE_DIRS = ( ) # Celery stuff - -BROKER_URL = 'redis://localhost:6379' -CELERY_RESULT_BACKEND = 'redis://localhost:6379' +REDIS_HOST = 'redis' +BROKER_TRANSPORT = 'redis' +#--Development--# (Para Pruebas Locales) +BROKER_URL = 'redis://127.0.0.1:6300' +CELERY_RESULT_BACKEND = 'redis://localhost:6300' +#---------------# +#--Production---# (Para Docker) +#CELERY_BROKER_TRANSPORT = BROKER_URL = 'redis://%s:6379/0' % REDIS_HOST +#CELERY_RESULT_BACKEND = 'redis://%s:6379/0' % REDIS_HOST +#---------------# CELERY_ACCEPT_CONTENT = ['application/json'] CELERY_TASK_SERIALIZER = 'json' CELERY_RESULT_SERIALIZER = 'json' diff --git a/radarsys/urls.py b/radarsys/urls.py index b265ec0..51e2131 100644 --- a/radarsys/urls.py +++ b/radarsys/urls.py @@ -15,7 +15,7 @@ Including another URLconf """ from django.conf.urls import include, url from django.contrib import admin -from django.contrib.staticfiles.urls import staticfiles_urlpatterns +#from django.contrib.staticfiles.urls import staticfiles_urlpatterns urlpatterns = [ url(r'^admin/', include(admin.site.urls)), @@ -30,4 +30,4 @@ urlpatterns = [ url(r'^misc/', include('apps.misc.urls')), ] -urlpatterns += staticfiles_urlpatterns() +#urlpatterns += staticfiles_urlpatterns() diff --git a/readme_docker.md b/readme_docker.md index 072ec39..92bdb4b 100644 --- a/readme_docker.md +++ b/readme_docker.md @@ -31,6 +31,9 @@ docker run -d --name radarsys01 --link mysql-radarsys-server -p 3000:3000 \ MEDIA_ROOT: 'media' ### En el script abs/utils/Graphics_OverJro.py, matplotlib Agg debe estar habilitado matplotlib.use("Agg") +### En el script radarsys/urls.py comentar para que nginx sirva "static": + #from django.contrib.staticfiles.urls import staticfiles_urlpatterns + #urlpatterns += staticfiles_urlpatterns() ### Ejecutar los siguientes comandos (solo si ya se creo mysql-radarsys-server): python manage.py makemigrations \ diff --git a/requirements.txt b/requirements.txt index e0fe395..beef80e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,5 @@ matplotlib scipy celery gunicorn -requests==2.11.1 \ No newline at end of file +requests==2.11.1 +redis