- Tentative fix doscker-compose vars

Dockerfile

@@ -9,4 +9,5 @@ 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 ["paver", "start_django", "-b", "0.0.0.0:8000"]
+CMD ["uwsgi", "--ini", "uwsgi.ini"]

docker-compose.yml

@@ -99,7 +99,8 @@ services:
       - db
       # - elasticsearch
       - rabbitmq
-    command: paver start_django -b 0.0.0.0:8000
+    # command: paver start_django -b 0.0.0.0:8000
+    command: uwsgi --ini uwsgi.ini
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - geoserver-data-dir:/geoserver_data/data
@@ -119,6 +120,8 @@ services:
       - django
       - celery
       - geoserver
+    env_file:
+      - ./scripts/docker/env/production/django.env
     ports:
       - "80:80"
 

scripts/docker/env/production/django.env

@@ -10,14 +10,14 @@ GEONODE_GEODATABASE=geonode_data
 GEONODE_GEODATABASE_PASSWORD=geonode_data
 ASYNC_SIGNALS=False
 BROKER_URL=amqp://guest:guest@rabbitmq:5672
-ALLOWED_HOSTS=['localhost', 'django',]
+ALLOWED_HOSTS=['localhost', 'django', 'geonode']
 DOCKER_ENV=production
 UWSGI_CMD=uwsgi --ini /usr/src/app/uwsgi.ini
 IS_CELERY=False
 C_FORCE_ROOT=1
 GEOSERVER_PUBLIC_LOCATION=http://geonode/geoserver/
 GEOSERVER_LOCATION=http://geonode/geoserver/
-SITEURL=http://geonode/
+SITEURL=http://localhost/
 COMPOSE_HTTP_TIMEOUT=300
 # See https://github.com/geosolutions-it/geonode-generic/issues/28
 # to see why we force API version to 1.24

uwsgi.ini

@@ -1,7 +1,9 @@
 [uwsgi]
-http-socket = 0.0.0.0:8000
+uwsgi-socket = 0.0.0.0:8000
+# http-socket = 0.0.0.0:8000
 chdir = /usr/src/app/
-logto = /tmp/uwsgi.log
+logto = /var/log/geonode.log
+pidfile = /tmp/geonode.pid
 harakiri = 25
 module = geonode.wsgi:application
 master = 1