- Align to geonode-project Dockerfile and docker-compose

(cherry picked from commit 3e9709f)

Author: afabiani

Dockerfile

@@ -10,12 +10,13 @@ RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-k
 # This section is borrowed from the official Django image but adds GDAL and others
 RUN apt-get update && apt-get install -y \
         libpq-dev python-dev libxml2-dev \
-        libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev \
+        libxml2 libxslt1-dev zlib1g-dev libjpeg-dev \
         libmemcached-dev libldap2-dev libsasl2-dev libffi-dev
 
 RUN apt-get update && apt-get install -y \
         gcc zip gettext geoip-bin cron \
-        postgresql-client-11 sqlite3 spatialite-bin libsqlite3-mod-spatialite \
+        postgresql-client-11 \
+        sqlite3 spatialite-bin libsqlite3-mod-spatialite \
         python3-gdal python3-psycopg2 python3-ldap \
         python3-pip python3-pil python3-lxml python3-pylibmc \
         python3-dev libgdal-dev \
@@ -51,6 +52,11 @@ RUN pip install --upgrade --no-cache-dir --src /usr/src -r requirements.txt \
     && pip install pygdal==$(gdal-config --version).* \
     && pip install flower==0.9.4
 
+# Activate "memcached"
+RUN apt install memcached
+RUN pip install pylibmc \
+    && pip install sherlock
+
 # 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
@@ -59,5 +65,5 @@ RUN cd /usr/src/geonode-contribs/geonode-logstash; pip install --upgrade -e . \
 
 EXPOSE 8000
 
-ENTRYPOINT service cron restart && /usr/src/app/entrypoint.sh
+ENTRYPOINT service cron restart && service memcached restart && /usr/src/app/entrypoint.sh
 CMD ["uwsgi", "--ini", "/usr/src/app/uwsgi.ini"]

celery.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 nohup celery -A geonode.celery_app:app beat -l DEBUG -f /var/log/celery.log &>/dev/null &
-nohup celery -A geonode.celery_app:app worker -B -E --statedb=worker.state --loglevel=INFO --concurrency=10 -n worker1@%h -f /var/log/celery.log &>/dev/null &
+nohup celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=INFO --concurrency=10 -n worker1@%h -f /var/log/celery.log &>/dev/null &
 nohup celery -A geonode.celery_app:app flower --auto_refresh=True --debug=False --broker=${BROKER_URL} --basic_auth=${ADMIN_USERNAME}:${ADMIN_PASSWORD} --address=0.0.0.0 --port=5555 &>/dev/null &

tasks.py

@@ -77,7 +77,6 @@ def update(ctx):
         "monitoring_host_name": os.environ.get('MONITORING_HOST_NAME', 'geonode'),
         "monitoring_service_name": os.environ.get('MONITORING_SERVICE_NAME', 'local-geonode'),
         "monitoring_data_ttl": os.environ.get('MONITORING_DATA_TTL', 7),
-        "geoip_path": os.environ.get('GEOIP_PATH', '/mnt/volumes/statics/geoip.db'),
         "geonode_geodb_passwd": os.environ.get('GEONODE_GEODATABASE_PASSWORD', 'geonode_data'),
         "default_backend_datastore": os.environ.get('DEFAULT_BACKEND_DATASTORE', 'datastore'),
         "geonode_db_passwd": os.environ.get('GEONODE_DATABASE_PASSWORD', 'geonode'),
@@ -211,6 +210,21 @@ def prepare(ctx):
             client_secret=os.environ['OAUTH2_CLIENT_SECRET'],
             oauth_config=oauth_config
         ), pty=True)
+    ctx.run(
+        'sed -i "s|<userAuthorizationUri>.*</userAuthorizationUri>|<userAuthorizationUri>{new_ext_ip}o/authorize/</userAuthorizationUri>|g" {oauth_config}'.format(
+            new_ext_ip=os.environ['SITEURL'],
+            oauth_config=oauth_config
+        ), pty=True)
+    ctx.run(
+        'sed -i "s|<redirectUri>.*</redirectUri>|<redirectUri>{new_ext_ip}geoserver/index.html</redirectUri>|g" {oauth_config}'.format(
+            new_ext_ip=os.environ['SITEURL'],
+            oauth_config=oauth_config
+        ), pty=True)
+    ctx.run(
+        'sed -i "s|<logoutUri>.*</logoutUri>|<logoutUri>{new_ext_ip}account/logout/</logoutUri>|g" {oauth_config}'.format(
+            new_ext_ip=os.environ['SITEURL'],
+            oauth_config=oauth_config
+        ), pty=True)
 
 
 @task
@@ -222,7 +236,7 @@ def fixtures(ctx):
 --settings={0}".format(_localsettings()), pty=True)
     ctx.run("python manage.py loaddata /tmp/default_site.json \
 --settings={0}".format(_localsettings()), pty=True)
-    ctx.run("python manage.py loaddata /usr/src/app/fixtures/initial_data.json \
+    ctx.run("python manage.py loaddata initial_data \
 --settings={0}".format(_localsettings()), pty=True)
     ctx.run("python manage.py set_all_layers_alternate \
 --settings={0}".format(_localsettings()), pty=True)

uwsgi.ini

@@ -12,17 +12,18 @@ vacuum = true                        ; Delete sockets during shutdown
 single-interpreter = true
 die-on-term = true                   ; Shutdown when receiving SIGTERM (default is respawn)
 need-app = true
+thunder-lock = true
 
-touch-reload = /usr/src/geonode_master/geonode_master/wsgi.py
+touch-reload = /usr/src/app/geonode/wsgi.py
 buffer-size = 32768
 
-harakiri = 1200                       ; forcefully kill workers after 600 seconds
+harakiri = 600                       ; forcefully kill workers after 600 seconds
 py-callos-afterfork = true           ; allow workers to trap signals
 
 max-requests = 1000                  ; Restart workers after this many requests
 max-worker-lifetime = 3600           ; Restart workers after this many seconds
 reload-on-rss = 2048                 ; Restart workers after this much resident memory
-worker-reload-mercy = 1200            ; How long to wait before forcefully killing workers
+worker-reload-mercy = 600            ; How long to wait before forcefully killing workers
 
 cheaper-algo = busyness
 processes = 128                      ; Maximum number of workers allowed
@@ -37,6 +38,6 @@ cheaper-busyness-max = 70            ; Above this threshold, spawn new workers
 cheaper-busyness-backlog-alert = 16  ; Spawn emergency workers if more than this many requests are waiting in the queue
 cheaper-busyness-backlog-step = 2    ; How many emergency workers to create if there are too many requests in the queue
 
-# cron = -1 -1 -1 -1 -1 sh -c '/usr/src/geonode_master/manage.sh collect_metrics -n -t xml';
+# cron = -1 -1 -1 -1 -1 sh -c '/usr/src/geonode/manage.sh collect_metrics -n -t xml';
 cron = 0 0 -1 -1 -1 sh -c 'find /backup_restore/ -type f -mtime +30 -exec rm -f {} \;'
 cron = 0 0 -1 -1 -1 sh -c 'find /backup_restore/ -type d -ctime +30 -exec rm -rf {} \;'

wait-for-databases.sh

@@ -5,7 +5,7 @@ set -e
 host="$1"
 shift
 
-until PGPASSWORD=postgres psql -h "$host" -U "postgres" -P "pager=off" -c '\l'; do
+until PGPASSWORD=${POSTGRES_PASSWORD} psql -h "$host" -U ${POSTGRES_USER} -P "pager=off" -c '\l'; do
   >&2 echo "Postgres is unavailable - sleeping"
   sleep 1
 done