labepn
diff --git a/‎.circleci/config.yml
+7-32 b/‎.circleci/config.yml
+7-32
diff --git a/‎.env
+4-3 b/‎.env
+4-3
diff --git a/‎.env_test
+68-42 b/‎.env_test
+68-42
diff --git a/‎Dockerfile
+5-5 b/‎Dockerfile
+5-5
diff --git a/‎entrypoint.sh
+28-37 b/‎entrypoint.sh
+28-37
diff --git a/‎geonode/__init__.py
-1 b/‎geonode/__init__.py
-1
@@ -93,11 +93,6 @@ jobs:
           command: docker logs django4geonode --tail 500
           when: on_fail
 
-      - run:
-          name: Invoke logs (debug)
-          command: docker exec -it django4geonode sh -c 'tail -1000 /usr/src/geonode/invoke.log'
-          when: on_fail
-
       - when:
           condition: <<parameters.test_suite>>
           steps:
@@ -126,44 +121,24 @@ workflows:
     jobs:
       - build:
           name: geonode_test_suite_smoke
-          load_docker_cache: true
-          save_docker_cache: true
+          load_docker_cache: false
+          save_docker_cache: false
           test_suite: ./test.sh geonode.tests.smoke geonode.tests.test_message_notifications geonode.tests.test_rest_api geonode.tests.test_search geonode.tests.test_utils
       - build:
           name: geonode_test_suite
-          load_docker_cache: true
+          load_docker_cache: false
           save_docker_cache: false
           test_suite: ./test.sh $(python -c "import sys;from geonode import settings;sys.stdout.write('\'' '\''.join([a+'\''.tests'\'' for a in settings.GEONODE_APPS]))") geonode.catalogue.backends.tests geonode.thumbs.tests
-          requires:
-            - geonode_test_suite_smoke
       - build:
           name: geonode_test_rest_apis
-          load_docker_cache: true
+          load_docker_cache: false
           save_docker_cache: false
-          test_suite: ./test.sh geonode.base.api.tests geonode.layers.api.tests geonode.maps.api.tests geonode.documents.api.tests geonode.geoapps.api.tests
-          requires:
-            - geonode_test_suite_smoke
+          test_suite: ./test.sh geonode.base.api.tests geonode.layers.api.tests geonode.maps.api.tests geonode.documents.api.tests geonode.geoapps.api.tests geonode.upload.api.tests
       - build:
           name: geonode_test_integration_csw
-          load_docker_cache: true
+          load_docker_cache: false
           save_docker_cache: false
           test_suite: ./test_csw.sh
-          requires:
-            - geonode_test_suite_smoke
-      - build:
-          name: geonode_test_integration_monitoring
-          load_docker_cache: true
-          save_docker_cache: false
-          test_suite: ./test.sh geonode.tests.smoke geonode.monitoring.tests.integration
-          requires:
-            - geonode_test_suite_smoke
-      - build:
-          name: geonode_test_integration_upload
-          load_docker_cache: true
-          save_docker_cache: false
-          test_suite: ./test.sh geonode.upload.api.tests
-          requires:
-            - geonode_test_suite_smoke
 
       # TODO
       # - build:
@@ -184,7 +159,7 @@ workflows:
       #     name: tests_geoserver_integration
       #     load_docker_cache: true
       #     save_docker_cache: false
-      #     test_suite: 'geonode.geoserver.tests.integration'
+      #     test_suite: 'geonode.geoserver.tests.integration geonode.monitoring.tests.integration'
       #     requires:
       #       - geonode_test_suite_smoke
 
 
@@ -8,14 +8,15 @@ BACKUPS_VOLUME_DRIVER=local
 
 C_FORCE_ROOT=1
 FORCE_REINIT=false
+INVOKE_LOG_STDOUT=true
 
 # LANGUAGE_CODE=pt
 # LANGUAGES=(('en','English'),('pt','Portuguese'))
 
 DJANGO_SETTINGS_MODULE=geonode.settings
 GEONODE_INSTANCE_NAME=geonode
-GEONODE_LB_HOST_IP
-GEONODE_LB_PORT
+GEONODE_LB_HOST_IP=
+GEONODE_LB_PORT=
 
 # #################
 # backend
@@ -119,7 +120,7 @@ DEFAULT_FROM_EMAIL='GeoNode <no-reply@geonode.org>'
 # Session/Access Control
 LOCKDOWN_GEONODE=False
 CORS_ORIGIN_ALLOW_ALL=True
-X_FRAME_OPTIONS=ALLOW-FROM ALL
+X_FRAME_OPTIONS="ALLOW-FROM ALL"
 SESSION_EXPIRED_CONTROL_ENABLED=True
 DEFAULT_ANONYMOUS_VIEW_PERMISSION=True
 DEFAULT_ANONYMOUS_DOWNLOAD_PERMISSION=True
 
@@ -7,14 +7,20 @@ DOCKER_API_VERSION="1.24"
 BACKUPS_VOLUME_DRIVER=local
 
 C_FORCE_ROOT=1
+FORCE_REINIT=false
+INVOKE_LOG_STDOUT=true
 
-DEBUG=False
+# LANGUAGE_CODE=pt
+# LANGUAGES=(('en','English'),('pt','Portuguese'))
 
 DJANGO_SETTINGS_MODULE=geonode.settings
 GEONODE_INSTANCE_NAME=geonode
 GEONODE_LB_HOST_IP=
 GEONODE_LB_PORT=
 
+# #################
+# backend
+# #################
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 GEONODE_DATABASE=geonode
@@ -23,6 +29,8 @@ GEONODE_GEODATABASE=geonode_data
 GEONODE_GEODATABASE_PASSWORD=geonode_data
 GEONODE_DATABASE_SCHEMA=public
 GEONODE_GEODATABASE_SCHEMA=public
+DATABASE_HOST=db
+DATABASE_PORT=5432
 DATABASE_URL=postgis://geonode:geonode@db:5432/geonode
 GEODATABASE_URL=postgis://geonode_data:geonode_data@db:5432/geonode_data
 GEONODE_DB_CONN_MAX_AGE=0
@@ -33,12 +41,9 @@ ASYNC_SIGNALS=True
 
 SITEURL=http://localhost:8001/
 
-STATIC_ROOT=/mnt/volumes/statics/static/
-MEDIA_ROOT=/mnt/volumes/statics/uploaded/
-GEOIP_PATH=/mnt/volumes/statics/geoip.db
-
 ALLOWED_HOSTS="['django', '*']"
 
+# Data Uploader
 DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
@@ -47,20 +52,10 @@ HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
 HAYSTACK_ENGINE_INDEX_NAME=haystack
 HAYSTACK_SEARCH_RESULTS_PER_PAGE=200
 
-CACHE_BUSTING_STATIC_ENABLED=False
-CACHE_BUSTING_MEDIA_ENABLED=False
-
-MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyMemcacheCache
-MEMCACHED_LOCATION=127.0.0.1:11211
-MEMCACHED_LOCK_EXPIRE=3600
-MEMCACHED_LOCK_TIMEOUT=10
-
-MAX_DOCUMENT_SIZE=2
-CLIENT_RESULTS_LIMIT=5
-API_LIMIT_PER_PAGE=1000
-
+# #################
+# nginx
 # HTTPD Server
+# #################
 GEONODE_LB_HOST_IP=localhost
 GEONODE_LB_PORT=80
 
@@ -83,7 +78,9 @@ LETSENCRYPT_MODE=disabled
 
 RESOLVER=127.0.0.11
 
-# GIS Server
+# #################
+# geoserver
+# #################
 GEOSERVER_WEB_UI_LOCATION=http://localhost:8001/geoserver/
 GEOSERVER_PUBLIC_LOCATION=http://localhost:8001/geoserver/
 GEOSERVER_LOCATION=http://geoserver:8080/geoserver/
@@ -96,29 +93,10 @@ OGC_REQUEST_BACKOFF_FACTOR=0.3
 OGC_REQUEST_POOL_MAXSIZE=10
 OGC_REQUEST_POOL_CONNECTIONS=10
 
-# GIS Client
-GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
-MAPBOX_ACCESS_TOKEN=
-BING_API_KEY=
-GOOGLE_API_KEY=
-
-# Monitoring
-MONITORING_ENABLED=True
-MONITORING_DATA_TTL=365
-USER_ANALYTICS_ENABLED=True
-USER_ANALYTICS_GZIP=True
-CENTRALIZED_DASHBOARD_ENABLED=False
-MONITORING_SERVICE_NAME=local-geonode
-MONITORING_HOST_NAME=geonode
-
-# Other Options/Contribs
-MODIFY_TOPICCATEGORY=True
-AVATAR_GRAVATAR_SSL=True
-AVATAR_DEFAULT_URL=/geonode/img/avatar.png
-
-EXIF_ENABLED=True
-CREATE_LAYER=True
-FAVORITE_ENABLED=True
+# Java Options & Memory
+ENABLE_JSONP=true
+outFormat=text/javascript
+GEOSERVER_JAVA_OPTS="-Djava.awt.headless=true -Xms2G -Xmx4G -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -DALLOW_ENV_PARAMETRIZATION=true -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
 
 # #################
 # Security
@@ -166,3 +144,51 @@ OAUTH2_CLIENT_SECRET=rCnp5txobUo83EpQEblM8fVj3QT5zb5qRfxNsuPzCqZaiRyIoxM4jdgMiZK
 # GeoNode APIs
 API_LOCKDOWN=False
 TASTYPIE_APIKEY=
+
+# #################
+# Production and
+# Monitoring
+# #################
+DEBUG=False
+
+SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
+
+STATIC_ROOT=/mnt/volumes/statics/static/
+MEDIA_ROOT=/mnt/volumes/statics/uploaded/
+GEOIP_PATH=/mnt/volumes/statics/geoip.db
+
+CACHE_BUSTING_STATIC_ENABLED=False
+CACHE_BUSTING_MEDIA_ENABLED=False
+
+MEMCACHED_ENABLED=False
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_LOCATION=127.0.0.1:11211
+MEMCACHED_LOCK_EXPIRE=3600
+MEMCACHED_LOCK_TIMEOUT=10
+
+MAX_DOCUMENT_SIZE=2
+CLIENT_RESULTS_LIMIT=5
+API_LIMIT_PER_PAGE=1000
+
+# GIS Client
+GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
+MAPBOX_ACCESS_TOKEN=
+BING_API_KEY=
+GOOGLE_API_KEY=
+
+# Monitoring
+MONITORING_ENABLED=True
+MONITORING_DATA_TTL=365
+USER_ANALYTICS_ENABLED=True
+USER_ANALYTICS_GZIP=True
+CENTRALIZED_DASHBOARD_ENABLED=False
+MONITORING_SERVICE_NAME=local-geonode
+MONITORING_HOST_NAME=geonode
+
+# Other Options/Contribs
+MODIFY_TOPICCATEGORY=True
+AVATAR_GRAVATAR_SSL=True
+EXIF_ENABLED=True
+CREATE_LAYER=True
+FAVORITE_ENABLED=True
+
@@ -64,11 +64,11 @@ RUN chmod +x /usr/bin/celery-commands
 COPY celery-cmd /usr/bin/celery-cmd
 RUN chmod +x /usr/bin/celery-cmd
 
-# Install "geonode-contribs" apps
-RUN cd /usr/src; git clone https://github.com/GeoNode/geonode-contribs.git -b master
-# Install logstash and centralized dashboard dependencies
-RUN cd /usr/src/geonode-contribs/geonode-logstash; pip install --upgrade  -e . \
-    cd /usr/src/geonode-contribs/ldap; pip install --upgrade  -e .
+# # Install "geonode-contribs" apps
+# RUN cd /usr/src; git clone https://github.com/GeoNode/geonode-contribs.git -b master
+# # Install logstash and centralized dashboard dependencies
+# RUN cd /usr/src/geonode-contribs/geonode-logstash; pip install --upgrade  -e . \
+#     cd /usr/src/geonode-contribs/ldap; pip install --upgrade  -e .
 
 RUN pip install --upgrade --no-cache-dir  --src /usr/src -r requirements.txt
 RUN pip install --upgrade  -e .
 
@@ -3,6 +3,17 @@
 # Exit script in case of error
 set -e
 
+INVOKE_LOG_STDOUT=${INVOKE_LOG_STDOUT:-FALSE}
+invoke () {
+    if [ $INVOKE_LOG_STDOUT = 'true' ] || [ $INVOKE_LOG_STDOUT = 'True' ]
+    then
+        /usr/local/bin/invoke $@
+    else
+        /usr/local/bin/invoke $@ > /usr/src/geonode/invoke.log 2>&1
+    fi
+    echo "$@ tasks done"
+}
+
 # Start cron && memcached services
 service cron restart
 service memcached restart
@@ -12,7 +23,7 @@ echo "-----------------------------------------------------"
 echo "STARTING DJANGO ENTRYPOINT $(date)"
 echo "-----------------------------------------------------"
 
-/usr/local/bin/invoke update > /usr/src/geonode/invoke.log 2>&1
+invoke update
 
 source $HOME/.bashrc
 source $HOME/.override_env
@@ -30,8 +41,7 @@ echo MONITORING_HOST_NAME=$MONITORING_HOST_NAME
 echo MONITORING_SERVICE_NAME=$MONITORING_SERVICE_NAME
 echo MONITORING_DATA_TTL=$MONITORING_DATA_TTL
 
-/usr/local/bin/invoke waitfordbs > /usr/src/geonode/invoke.log 2>&1
-echo "waitfordbs task done"
+invoke waitfordbs
 
 cmd="$@"
 
@@ -40,13 +50,9 @@ echo DOCKER_ENV=$DOCKER_ENV
 if [ -z ${DOCKER_ENV} ] || [ ${DOCKER_ENV} = "development" ]
 then
 
-    echo "running migrations"
-    /usr/local/bin/invoke migrations > /usr/src/geonode/invoke.log 2>&1
-    echo "migrations task done"
-    /usr/local/bin/invoke prepare > /usr/src/geonode/invoke.log 2>&1
-    echo "prepare task done"
-    /usr/local/bin/invoke fixtures > /usr/src/geonode/invoke.log 2>&1
-    echo "fixture task done"
+    invoke migrations
+    invoke prepare
+    invoke fixtures
 
     if [ ${IS_CELERY} = "true" ] || [ ${IS_CELERY} = "True" ]
     then
@@ -55,11 +61,8 @@ then
 
     else
 
-        echo "install requirements for development"
-        /usr/local/bin/invoke devrequirements > /usr/src/geonode/invoke.log 2>&1
-        echo "refresh static data"
-        /usr/local/bin/invoke statics > /usr/src/geonode/invoke.log 2>&1
-        echo "static data refreshed"
+        invoke devrequirements
+        invoke statics
 
         echo "Executing standard Django server $cmd for Development"
 
@@ -71,32 +74,20 @@ else
         echo "Executing Celery server $cmd for Production"
     else
 
-        echo "running migrations"
-        /usr/local/bin/invoke migrations > /usr/src/geonode/invoke.log 2>&1
-        echo "migrations task done"
-        /usr/local/bin/invoke prepare > /usr/src/geonode/invoke.log 2>&1
-        echo "prepare task done"
+        invoke migrations
+        invoke prepare
 
         if [ ${FORCE_REINIT} = "true" ]  || [ ${FORCE_REINIT} = "True" ] || [ ! -e "/mnt/volumes/statics/geonode_init.lock" ]; then
-            /usr/local/bin/invoke updategeoip > /usr/src/geonode/invoke.log 2>&1
-            echo "updategeoip task done"
-            /usr/local/bin/invoke fixtures > /usr/src/geonode/invoke.log 2>&1
-            echo "fixture task done"
-            /usr/local/bin/invoke monitoringfixture > /usr/src/geonode/invoke.log 2>&1
-            echo "monitoringfixture task done"
-            /usr/local/bin/invoke initialized > /usr/src/geonode/invoke.log 2>&1
-            echo "initialized"
+            invoke updategeoip
+            invoke fixtures
+            invoke monitoringfixture
+            invoke initialized
         fi
 
-        echo "refresh static data"
-        /usr/local/bin/invoke statics > /usr/src/geonode/invoke.log 2>&1
-        echo "static data refreshed"
-        /usr/local/bin/invoke waitforgeoserver > /usr/src/geonode/invoke.log 2>&1
-        echo "waitforgeoserver task done"
-        /usr/local/bin/invoke geoserverfixture > /usr/src/geonode/invoke.log 2>&1
-        echo "geoserverfixture task done"
-        /usr/local/bin/invoke updateadmin > /usr/src/geonode/invoke.log 2>&1
-        echo "updateadmin task done"
+        invoke statics
+        invoke waitforgeoserver
+        invoke geoserverfixture
+        invoke updateadmin
 
         echo "Executing UWSGI server $cmd for Production"
     fi
 
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #########################################################################
 #
 # Copyright (C) 2016 OSGeo
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`#########################################################################`
`3`	`2`	`#`
`4`	`3`	`# Copyright (C) 2016 OSGeo`