diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..48913a2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,30 @@ +FROM bitnami/minideb:jessie + +# setup libraries +RUN install_packages python \ + python-pip \ + python-dev \ + gfortran \ + libpng-dev \ + freetype* \ + libblas-dev \ + liblapack-dev \ + libatlas-base-dev +# set working directory +RUN mkdir /radarsys +WORKDIR /radarsys + +# Copy the main application. +COPY . ./ + +# Install python dependences +RUN pip install -r requirements.txt +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/jars_initial_data.json + +EXPOSE 3000 +CMD ["python", "manage.py", "runserver", "0.0.0.0:3000"] + diff --git a/apps/main/urls.py b/apps/main/urls.py index 7eb65bb..8788da7 100644 --- a/apps/main/urls.py +++ b/apps/main/urls.py @@ -4,6 +4,9 @@ from apps.main import views urlpatterns = ( url(r'^$', views.index, name='index'), + + url(r'^realtime/$', views.real_time, name='url_real_time'), + url(r'^location/new/$', views.location_new, name='url_add_location'), url(r'^location/$', views.locations, name='url_locations'), url(r'^location/(?P-?\d+)/$', views.location, name='url_location'), diff --git a/apps/main/views.py b/apps/main/views.py index 98d1d58..71098e5 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -1707,3 +1707,17 @@ def radar_refresh(request, id_camp, id_radar): exp.get_status() return HttpResponseRedirect(reverse('url_operation', args=[id_camp])) + + +def real_time(request): + + graphic_path = "/home/fiorella/Pictures/catwbeanie.jpg" + + kwargs = {} + kwargs['title'] = 'CLAIRE' + kwargs['suptitle'] = 'Real Time' + kwargs['no_sidebar'] = True + kwargs['graphic_path'] = graphic_path + kwargs['graphic1_path'] = 'http://www.bluemaize.net/im/girls-accessories/shark-beanie-11.jpg' + + return render(request, 'real_time.html', kwargs) \ No newline at end of file diff --git a/radarsys/settings.py b/radarsys/settings.py index 0c6a01a..2c74a3a 100644 --- a/radarsys/settings.py +++ b/radarsys/settings.py @@ -114,14 +114,19 @@ USE_TZ = False # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.8/howto/static-files/ +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') +MEDIA_URL = '/site_media/' + STATIC_URL = '/static/' -STATIC_ROOT = '/var/www/html/static/' +#STATIC_ROOT = '/var/www/html/static/' +STATIC_ROOT = os.path.join(MEDIA_ROOT, 'static') #STATICFILES_DIRS = ( # os.path.join(BASE_DIR, 'apps', 'main', 'static'), # #) + STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',