- 2.10 stable release

GeoNode · Jul 10, 2019 · a6f418d · a6f418d
1 parent fdac9d0
commit a6f418d
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 23 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM geonode/geonode:latest
+FROM geonode/geonode:2.10
 MAINTAINER GeoNode development team
 
 COPY requirements.txt /usr/src/app/

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ http://master.demo.geonode.org. After your registration you will be able
 to test all basic functionalities like uploading layers, creation of
 maps, editing metadata, styles and much more. To get an overview what
 GeoNode can do we recommend to have a look at the [Users
-Workshop](http://docs.geonode.org/en/master/tutorials/users/index.html).
+Workshop](http://docs.geonode.org/en/2.10.x/tutorials/users/index.html).
 
 Install
 -------
@@ -54,17 +54,17 @@ GeoNode can be setup in different ways, flavors and plattforms. If
 you´re planning to do development or install for production please visit
 the offical GeoNode installation documentation:
 
-- [Docker](http://docs.geonode.org/en/master/install/core/index.html#docker)
-- [Ubuntu 18.04](http://docs.geonode.org/en/master/install/core/index.html#ubuntu-18-04)
+- [Docker](http://docs.geonode.org/en/2.10.x/install/core/index.html#docker)
+- [Ubuntu 18.04](http://docs.geonode.org/en/2.10.x/install/core/index.html#ubuntu-18-04)
 
 Learn GeoNode
 -------------
 
 After you´ve finished the setup process make yourself familiar with the
 general usage and settings of your GeoNodes instance. - the [User
-Training](http://docs.geonode.org/en/master/tutorials/users/index.html)
+Training](http://docs.geonode.org/en/2.10.x/tutorials/users/index.html)
 is going in depth into what we can do. - the [Administrators
-Workshop](http://docs.geonode.org/en/master/tutorials/admin/index.html)
+Workshop](http://docs.geonode.org/en/2.10.x/tutorials/admin/index.html)
 will guide you to the most important parts regarding management commands
 and configuration settings.
 
@@ -83,7 +83,7 @@ lightweight components to speed up things.
 To get you started have a look at the [Install
 instructions](#install) which cover all what is needed to run GeoNode
 for development. Further visit the the [Developer
-workshop](http://docs.geonode.org/en/master/tutorials/devel/index.html)
+workshop](http://docs.geonode.org/en/2.10.x/tutorials/devel/index.html)
 for a basic overview.
 
 If you're planning of customizing your GeoNode instance, or to extend

diff --git a/docker-compose.async.yml b/docker-compose.async.yml
@@ -40,7 +40,7 @@ services:
 
   celery:
     restart: unless-stopped
-    image: geonode/geonode:latest
+    image: geonode/geonode:2.10
     container_name: celery4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true
@@ -79,7 +79,7 @@ services:
 
   django:
     restart: unless-stopped
-    image: geonode/geonode:latest
+    image: geonode/geonode:2.10
     container_name: django4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
 
   django:
     restart: unless-stopped
-    image: geonode/geonode:latest
+    image: geonode/geonode:2.10
     container_name: django4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true

diff --git a/docs/basic/theme/index.rst b/docs/basic/theme/index.rst
@@ -247,7 +247,7 @@ You can see on `line 189 of the GeoNode base.html template <https://github.com/G
                 {% if not custom_theme.jumbotron_cta_hide %}
                     <p>
                         <a class="btn btn-default btn-lg" target="_blank" role="button"
-                          href="{{custom_theme.jumbotron_cta_link|default:_('http://docs.geonode.org/en/master/usage/')}}">
+                          href="{{custom_theme.jumbotron_cta_link|default:_('http://docs.geonode.org/en/2.10.x/usage/')}}">
                             {{custom_theme.jumbotron_cta_text|default:_("Get Started &raquo;")}}
                         </a>
                     </p>

diff --git a/docs/install/core/index.rst b/docs/install/core/index.rst
@@ -1295,7 +1295,7 @@ It is possible to let docker show which containers are currently running (add ``
 
   CONTAINER ID        IMAGE                      COMMAND                  CREATED             STATUS              PORTS                NAMES
   3b232931f820        geonode/nginx:geoserver    "nginx -g 'daemon of…"   26 minutes ago      Up 26 minutes       0.0.0.0:80->80/tcp   nginx4geonode
-  ff7002ae6e91        geonode/geonode:latest     "/usr/src/app/entryp…"   26 minutes ago      Up 26 minutes       8000/tcp             django4geonode
+  ff7002ae6e91        geonode/geonode:2.10       "/usr/src/app/entryp…"   26 minutes ago      Up 26 minutes       8000/tcp             django4geonode
   2f155e5043be        geonode/geoserver:2.14.3   "/usr/local/tomcat/t…"   26 minutes ago      Up 26 minutes       8080/tcp             geoserver4geonode
   97f1668a01b1        geonode_celery             "/usr/src/app/entryp…"   26 minutes ago      Up 26 minutes       8000/tcp             geonode_celery_1
   1b623598b1bd        geonode/postgis:10         "docker-entrypoint.s…"   About an hour ago   Up 26 minutes       5432/tcp             db4geonode

diff --git a/geonode/__init__.py b/geonode/__init__.py
@@ -20,7 +20,7 @@
 
 import os
 
-__version__ = (2, 10, 0, 'rc', 5)
+__version__ = (2, 10, 0, 'final', 0)
 
 
 default_app_config = "geonode.apps.AppConfig"

diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py
@@ -73,7 +73,7 @@
     msg = (
         'Please configure OGC_SERVER when enabling geonode.geoserver.'
         ' More info can be found at '
-        'http://docs.geonode.org/en/master/basic/settings/index.html#ogc-server')
+        'http://docs.geonode.org/en/2.10.x/basic/settings/index.html#ogc-server')
     raise ImproperlyConfigured(msg)
 
 

diff --git a/geonode/locale/ar/LC_MESSAGES/django.po b/geonode/locale/ar/LC_MESSAGES/django.po
@@ -6266,8 +6266,8 @@ msgid "GeoNode is an open source platform for sharing geospatial data and maps."
 msgstr "GeoNode هو منصة مفتوحة المصدر لتبادل البيانات الجغرافية والخرائط."
 
 #: geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/master/usage"
-msgstr "http://docs.geonode.org/en/master/usage"
+msgid "http://docs.geonode.org/en/2.10.x/usage"
+msgstr "http://docs.geonode.org/en/2.10.x/usage"
 
 #: geonode/templates/index.html:23
 msgid "Get Started &raquo;"

diff --git a/geonode/locale/de/LC_MESSAGES/django.po b/geonode/locale/de/LC_MESSAGES/django.po
@@ -1084,8 +1084,8 @@ msgstr "GeoNode ist eine Open-Source-Plattform zur Veröffentlichung von Geodate
 
 #: geonode/contrib/geosites/site_template/templates/site_index.html:14
 #: geonode/contrib/geosites/templates/master_index.html:15 geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/master/usage"
-msgstr "http://docs.geonode.org/en/master/usage"
+msgid "http://docs.geonode.org/en/2.10.x/usage"
+msgstr "http://docs.geonode.org/en/2.10.x/usage"
 
 #: geonode/contrib/geosites/site_template/templates/site_index.html:15
 #: geonode/contrib/geosites/templates/master_index.html:16 geonode/templates/index.html:23

diff --git a/geonode/locale/el/LC_MESSAGES/django.po b/geonode/locale/el/LC_MESSAGES/django.po
@@ -1182,7 +1182,7 @@ msgstr ""
 #: geonode/contrib/geosites/site_template/templates/site_index.html:14
 #: geonode/contrib/geosites/templates/master_index.html:15
 #: geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/master/usage"
+msgid "http://docs.geonode.org/en/2.10.x/usage"
 msgstr ""
 
 #: geonode/contrib/geosites/site_template/templates/site_index.html:15

diff --git a/geonode/locale/en/LC_MESSAGES/django.po b/geonode/locale/en/LC_MESSAGES/django.po
@@ -7827,7 +7827,7 @@ msgid "home"
 msgstr ""
 
 #: geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/master/usage"
+msgid "http://docs.geonode.org/en/2.10.x/usage"
 msgstr ""
 
 #: geonode/templates/index.html:23

diff --git a/geonode/locale/it/LC_MESSAGES/django.po b/geonode/locale/it/LC_MESSAGES/django.po
@@ -7459,7 +7459,7 @@ msgid "home"
 msgstr ""
 
 #: geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/master/usage"
+msgid "http://docs.geonode.org/en/2.10.x/usage"
 msgstr ""
 
 #: geonode/templates/index.html:23

diff --git a/geonode/templates/index.html b/geonode/templates/index.html
@@ -20,7 +20,9 @@ <h1>{{custom_theme.jumbotron_welcome_title|default:_("Welcome")}}</h1>
   		<p></p>
 		<p>{{custom_theme.jumbotron_welcome_content|default:_("GeoNode is an open source platform for sharing geospatial data and maps.")}}</p>
 		{% if not custom_theme.jumbotron_cta_hide %}
-  		<p><a class="btn btn-default btn-lg" target="_blank" href="{{custom_theme.jumbotron_cta_link|default:_("http://docs.geonode.org/en/master/usage")}}" role="button">{{custom_theme.jumbotron_cta_text|default:_("Get Started &raquo;")}}</a></p>
+  		<p><a class="btn btn-default btn-lg" target="_blank"
+  				href="{{custom_theme.jumbotron_cta_link|default:_("http://docs.geonode.org/en/2.10.x/usage")}}"
+  				role="button">{{custom_theme.jumbotron_cta_text|default:_("Get Started &raquo;")}}</a></p>
 		{% endif %}
 	</div>
   </div>

diff --git a/geonode/tests/integration.py b/geonode/tests/integration.py
@@ -106,7 +106,7 @@ def zip_dir(basedir, archivename):
  --------------------
 
  1)
-  (http://docs.geonode.org/en/master/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode)
+  (http://docs.geonode.org/en/2.10.x/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode)
 
   $ paver setup