- Docker make use of GeoServer Importer Uploader

GeoNode · Jun 25, 2018 · 49ce37c · 49ce37c
1 parent be9a7a4
commit 49ce37c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,6 +8,8 @@ RUN python manage.py makemigrations --settings=geonode.settings
 RUN python manage.py migrate --settings=geonode.settings
 
 EXPOSE 8000
+
 # CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
 # CMD ["paver", "start_django", "-b", "0.0.0.0:8000"]
 CMD ["uwsgi", "--ini", "uwsgi.ini"]
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
       - ./scripts/docker/env/production/celery.env
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.13.x
+    image: geonode/geoserver_data:latest
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:
@@ -67,7 +67,7 @@ services:
       - geoserver-data-dir:/geoserver_data/data
 
   geoserver:
-    image: geonode/geoserver:2.13.x
+    image: geonode/geoserver:latest
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -775,12 +775,12 @@
 # Uploader Settings
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 100000
 UPLOADER = {
-    'BACKEND': 'geonode.rest',
+    'BACKEND': os.getenv('DEFAULT_BACKEND_UPLOADER', 'geonode.rest'),
     # 'BACKEND': 'geonode.importer',
     'OPTIONS': {
-        'TIME_ENABLED': False,
-        'MOSAIC_ENABLED': False,
-        'GEOGIG_ENABLED': False,
+        'TIME_ENABLED': strtobool(os.getenv('TIME_ENABLED', 'False')),
+        'MOSAIC_ENABLED': strtobool(os.getenv('MOSAIC_ENABLED', 'False')),
+        'GEOGIG_ENABLED': strtobool(os.getenv('GEOGIG_ENABLED', 'False')),
     },
     'SUPPORTED_CRS': [
         'EPSG:4326',

diff --git a/scripts/docker/env/production/django.env b/scripts/docker/env/production/django.env
@@ -17,8 +17,13 @@ IS_CELERY=False
 C_FORCE_ROOT=1
 GEOSERVER_PUBLIC_LOCATION=http://geonode/geoserver/
 GEOSERVER_LOCATION=http://geonode/geoserver/
-SITEURL=http://localhost/
+SITEURL=http://geonode/
 COMPOSE_HTTP_TIMEOUT=300
+DEFAULT_BACKEND_UPLOADER=geonode.importer
+TIME_ENABLED=True
+MOSAIC_ENABLED=False
+GEOGIG_ENABLED=False
+
 # See https://github.com/geosolutions-it/geonode-generic/issues/28
 # to see why we force API version to 1.24
 DOCKER_API_VERSION: "1.24"