Merge 08919af into 7f198ef

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7.6
+FROM python:3.8.9
 LABEL "MAINTAINER"="Cartologic Development Team"
 
 ENV PYTHONUNBUFFERED 1

cartoview/__init__.py

@@ -1,4 +1,4 @@
-__version__ = (1, 32, 0, 'unstable', 0)
+__version__ = (1, 33, 0, 'unstable', 0)
 __compatible_with__ = []
 
 

dev_config.yml

@@ -1,5 +1,4 @@
 ---
-GEOSERVER_URL: "https://www.dropbox.com/s/xlich7pmneaupqp/geoserver-2.18.2.war?dl=1"
-DATA_DIR_URL: "https://www.dropbox.com/s/q0qc2t7d9alo9fk/data-2.18.2.zip?dl=1"
+GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.19.x/geoserver.war"
+DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.19.x/geonode-geoserver-ext-web-app-data.zip"
 JETTY_RUNNER_URL: "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.31.v20200723/jetty-runner-9.4.31.v20200723.jar"
-

docker-compose.yml

@@ -1,13 +1,13 @@
 version: "3"
 services:
   postgis:
-    image: kartoza/postgis:11.5-2.5
+    image: kartoza/postgis:13
     volumes:
       - postgis-data:/var/lib/postgresql
       # - dbbackups:/backups
     environment:
       # If you need to create multiple database you can add coma separated databases eg gis,data
-      - POSTGRES_DB=cartoview,cartoview_datastore
+      - POSTGRES_DB=cartoview,cartoview_datastore,cartoview_geodatabase
       - POSTGRES_USER=docker
       - POSTGRES_PASS=docker
       - ALLOW_IP_RANGE=0.0.0.0/0
@@ -38,14 +38,14 @@ services:
     networks:
       -cartoview-internal:
   data-dir-conf:
-    image: geonode/geoserver_data:2.18.2
+    image: geonode/geoserver_data:2.19.x
     restart: on-failure
     container_name: gsconf4cartoview
     command: /bin/true
     volumes:
       - geoserver-dir:/geoserver_data/data
   geoserver:
-    image: geonode/geoserver:2.18.2
+    image: geonode/geoserver:2.19.x
     depends_on:
       - postgis
       - data-dir-conf

setup.py

@@ -25,7 +25,7 @@
     ],
     license="BSD",
     install_requires=[
-        'future', 'geonode==3.2.1',
+        'future', 'geonode==3.3.0',
         'Faker>=0.8.4',
         'cherrypy==11.0.0',
         'cheroot==5.8.3',