- Bump to officla spcgeonode images @ https://hub.docker.com/r/geono…

…de/spcgeonode/tags
gannebamm · Jan 22, 2020 · 221de30 · 221de30
1 parent 9b8eec4
commit 221de30
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 68 deletions.
diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample
@@ -533,7 +533,7 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == 'mapstore':
             "name": "mapnik",
             "source": "osm",
             "group": "background",
-            "visibility": False
+            "visibility": True
         },
         {
             "type": "tileprovider",

diff --git a/scripts/spcgeonode/docker-compose.override.yml b/scripts/spcgeonode/docker-compose.override.yml
@@ -1,60 +1,61 @@
-version: '3.4'
-
-
-# Common Django template for Geonode, Celery and Celerycam services below
-x-common-django:
-  &default-common-django
-  # image: olivierdalang/spcgeonode:django-latest
-  environment:
-    - DEBUG=True
-  volumes:
-    - ../../:/spcgeonode/
-    - ./_volume_static:/spcgeonode-static/
-    - ./_volume_media:/spcgeonode-media/
-
-services:
-  django:
-    << : *default-common-django
-    command: "uwsgi --chdir=/spcgeonode --module=geonode.wsgi --socket=:8000 --http=127.0.0.1:8001 --processes=5 --py-autoreload=2"
-  celery:
-    << : *default-common-django
-    command: 'celery worker --app=geonode.celery_app:app -l debug'
-  celerybeat:
-    << : *default-common-django
-    command: 'celery beat --app=geonode.celery_app:app --pidfile="/celerybeat.pid" -l debug'
-  celerycam:
-    << : *default-common-django
-    command: 'celery events --app=geonode.celery_app:app --pidfile="/celeryev.pid" --camera=django_celery_monitor.camera.Camera --frequency=2.0 -l debug'
-
-  nginx:
-    # image: olivierdalang/spcgeonode:nginx-latest
-    volumes:
-      - ./_volume_static:/spcgeonode-static/
-      - ./_volume_media:/spcgeonode-media/
-      - ./_volume_certificates:/spcgeonode-certificates/
-
-  geoserver:
-    # image: olivierdalang/spcgeonode:geoserver-latest
-    volumes:
-      - ./_volume_geodatadir:/spcgeonode-geodatadir/
-
-  letsencrypt:
-    # image: olivierdalang/spcgeonode:letsencrypt-latest
-    volumes:
-      - ./_volume_certificates:/spcgeonode-certificates/
-
-  pgdumper:
-    # image: olivierdalang/spcgeonode:pgdumper-latest
-    volumes:
-      - ./_volume_pgdumps:/spcgeonode-pgdumps/
-
-  rclone:
-    # image: olivierdalang/spcgeonode:rclone-latest
-    volumes:
-      - ./_volume_pgdumps:/spcgeonode-pgdumps/
-      - ./_volume_media:/spcgeonode-media/
-      - ./_volume_geodatadir:/spcgeonode-geodatadir/
-
-  postgres:
-    ports:
-      - "5432:5432"
+version: '3.4'
+
+
+# Common Django template for Geonode, Celery and Celerycam services below
+x-common-django:
+  &default-common-django
+  image: geonode/spcgeonode:django-2.10.x
+  environment:
+    - DEBUG=True
+  volumes:
+    - ../../:/spcgeonode/
+    - ./_volume_static:/spcgeonode-static/
+    - ./_volume_media:/spcgeonode-media/
+
+services:
+  django:
+    << : *default-common-django
+    command: "uwsgi --chdir=/spcgeonode --module=geonode.wsgi --socket=:8000 --http=127.0.0.1:8001 --processes=5 --py-autoreload=2"
+  celery:
+    << : *default-common-django
+    command: 'celery worker --app=geonode.celery_app:app -l debug'
+  celerybeat:
+    << : *default-common-django
+    command: 'celery beat --app=geonode.celery_app:app --pidfile="/celerybeat.pid" -l debug'
+  celerycam:
+    << : *default-common-django
+    command: 'celery events --app=geonode.celery_app:app --pidfile="/celeryev.pid" --camera=django_celery_monitor.camera.Camera --frequency=2.0 -l debug'
+
+  nginx:
+    image: geonode/spcgeonode:nginx-2.10.x
+    volumes:
+      - ./_volume_static:/spcgeonode-static/
+      - ./_volume_media:/spcgeonode-media/
+      - ./_volume_certificates:/spcgeonode-certificates/
+
+  geoserver:
+    image: geonode/spcgeonode:geoserver-2.10.x
+    volumes:
+      - ./_volume_geodatadir:/spcgeonode-geodatadir/
+
+  letsencrypt:
+    image: geonode/spcgeonode:letsencrypt-2.10.x
+    volumes:
+      - ./_volume_certificates:/spcgeonode-certificates/
+
+  pgdumper:
+    image: geonode/spcgeonode:pgdumper-2.10.x
+    volumes:
+      - ./_volume_pgdumps:/spcgeonode-pgdumps/
+
+  rclone:
+    image: geonode/spcgeonode:rclone-2.10.x
+    volumes:
+      - ./_volume_pgdumps:/spcgeonode-pgdumps/
+      - ./_volume_media:/spcgeonode-media/
+      - ./_volume_geodatadir:/spcgeonode-geodatadir/
+
+  postgres:
+    ports:
+      - "5432:5432"
+
diff --git a/scripts/spcgeonode/docker-compose.yml b/scripts/spcgeonode/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 # Common Django template for Geonode, Celery and Celerycam services below
 x-common-django:
   &default-common-django
-  # image: olivierdalang/spcgeonode:django-latest
+  image: geonode/spcgeonode:django-2.10.x
   build:
     context: ../../
     dockerfile: scripts/spcgeonode/django/Dockerfile
@@ -89,7 +89,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   nginx:
-    # image: olivierdalang/spcgeonode:nginx-latest
+    image: geonode/spcgeonode:nginx-2.10.x
     build: ./nginx/
     environment:
       - HTTPS_HOST=${HTTPS_HOST}
@@ -107,7 +107,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    # image: olivierdalang/spcgeonode:geoserver-latest
+    image: geonode/spcgeonode:geoserver-2.10.x
     build: ./geoserver/
     healthcheck:
       test: "curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://127.0.0.1:8080/geoserver/rest/workspaces/geonode.html"
@@ -130,7 +130,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    # image: olivierdalang/spcgeonode:letsencrypt-latest
+    image: geonode/spcgeonode:letsencrypt-2.10.x
     build: ./letsencrypt/
     environment:
       - HTTPS_HOST=${HTTPS_HOST}
@@ -144,7 +144,7 @@ services:
   # dumps the non geodata db
   pgdumper_nogeo:
     container_name: dumper_${GEONODE_DATABASE}_${COMPOSE_PROJECT_NAME}
-    # image: olivierdalang/pgdumper:latest
+    image: geonode/spcgeonode:pgdumper-2.10.x
     build: ./pgdumper/
     volumes:
       - pgdumps:/spcgeonode-pgdumps/
@@ -156,7 +156,7 @@ services:
   # dumps the geodata db
   pgdumper_geo:
     container_name: dumper_${GEONODE_GEODATABASE}_${COMPOSE_PROJECT_NAME}
-    # image: olivierdalang/pgdumper:latest
+    image: geonode/spcgeonode:pgdumper-2.10.x
     build: ./pgdumper/
     volumes:
       - pgdumps:/spcgeonode-pgdumps/
@@ -167,7 +167,7 @@ services:
       - DATABASE_URL=postgres://${GEONODE_GEODATABASE_USER}:${GEONODE_GEODATABASE_PASSWORD}@postgres:5432/${GEONODE_GEODATABASE}
 
   rclone:
-    # image: olivierdalang/spcgeonode:rclone-latest
+    image: geonode/spcgeonode:rclone-2.10.x
     build: ./rclone/
     environment:
       - S3_ACCESS_KEY=${S3_ACCESS_KEY}
@@ -216,3 +216,4 @@ volumes:
   certificates:
   pgdumps:
   rabbitmq:
+