Merge branch 'release/v3.5.0'

Author: royrusso

Dockerfile

@@ -1,41 +1,37 @@
 FROM python:3.6-alpine3.7
 
-RUN apk update
-RUN apk add supervisor
-RUN apk add --update py2-pip
-
 # Upgrade and install basic Python dependencies
 # This block added because of the trouble installing gevent on many systems
 # https://hub.docker.com/r/openwhisk/dockerskeleton/~/dockerfile/
-RUN apk add --no-cache bash \
- && apk add --no-cache --virtual .build-deps \
-        bzip2-dev \
-        gcc \
-        libc-dev
-#  && pip install --no-cache-dir gevent \
-#  && apk del .build-deps
-
-# reqs layer
-ADD requirements.txt .
-RUN pip3 install -U -r requirements.txt
-RUN pip3 install gunicorn==19.7.1
-
-# Bundle app source
-ADD . /src
-
-COPY ./deployment/logging.conf /src/logging.conf
-COPY ./deployment/gunicorn.conf /src/gunicorn.conf
-
+RUN apk update && \
+    apk add supervisor && \
+    apk add --update py2-pip && \
+    apk add --no-cache bash && \
+    apk add --no-cache --virtual .build-deps bzip2-dev gcc libc-dev
+
+# Copy project sources
+COPY . /src
+
+# Set working directory
+WORKDIR /src
+
+# Install app dependencies and create supervisord dirs
+RUN pip3 install -U -r requirements.txt && \
+    pip3 install gunicorn==19.7.1 && \
+    mkdir -p /etc/supervisor/conf.d /var/log/supervisor /var/run/supervisor
+
+# Copy configuration files
+RUN cp /src/deployment/logging.conf /src/logging.conf && \
+    cp /src/deployment/gunicorn.conf /src/gunicorn.conf && \
+    cp /src/deployment/supervisord.conf /etc/supervisor/supervisord.conf && \
+    cp /src/deployment/gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf
+
+# Fix permissions
+RUN chgrp -R 0 /src /var/log/supervisor /var/run/supervisor && \
+    chmod -R g=u  /src /var/log/supervisor /var/run/supervisor
+
+# Expose service port
 EXPOSE 5000
 
-# Setup supervisord
-RUN mkdir -p /var/log/supervisor
-COPY ./deployment/supervisord.conf /etc/supervisor/supervisord.conf
-COPY ./deployment/gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf
-
 # Start processes
 CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]
-
-
-#ENTRYPOINT ["python"]
-#CMD ["src/application.py"]

README.md

@@ -12,7 +12,7 @@ Simplified Monitoring and Management for ElasticSearch clusters.
 
 ![alt text](https://raw.githubusercontent.com/ElasticHQ/elasticsearch-HQ/master/main_dashboard.png)
 
-
+  
 ## Key Features
 
 * Works with 2.x, 5.x, 6.x and current versions of Elasticsearch. 
@@ -46,9 +46,12 @@ For further installation and configuration help, please read the docs: [ElasticH
 
 ## Docker Installation
 
-We are hosted on Dockerhub: [ElasticHQ on Dockerhub](https://hub.docker.com/r/elastichq/elasticsearch-hq/)
+We are hosted on Dockerhub: [ElasticHQ on Dockerhub](https://hub.docker.com/r/elastichq/elasticsearch-hq/)  
+
+1. ``docker run -p 5000:5000 elastichq/elasticsearch-hq``
+2. Access HQ with: `` http://localhost:5000 ``
 
-Please see relevant documentation: [Docker Images](http://docs.elastichq.org/installation.html#docker-images).
+For further instructions, please see relevant documentation: [Docker Images](http://docs.elastichq.org/installation.html#docker-images).
 
 ## Useful Links
 

application.py

@@ -1,9 +1,11 @@
 # import argparse
 import optparse
 import os
-
+import logging
+import logging.config
 from elastichq import create_app
 from elastichq.globals import socketio
+from elastichq.utils import find_config
 
 default_host = '0.0.0.0'
 default_port = 5000
@@ -45,7 +47,14 @@
     application.config['CA_CERTS'] = os.environ.get('HQ_CA_CERTS', options.ca_certs)
 
     if is_gunicorn:
+        if options.debug:
+            config = find_config('logger_debug.json')
+            logging.config.dictConfig(config)
+
         # we set reloader False so gunicorn doesn't call two instances of all the Flask init functions.
         socketio.run(application, host=options.host, port=options.port, debug=options.debug, use_reloader=False)
     else:
+        if options.debug:
+            config = find_config('logger_debug.json')
+            logging.config.dictConfig(config)
         socketio.run(application, host=options.host, port=options.port, debug=options.debug)

deployment/supervisord.conf

@@ -1,8 +1,15 @@
 [supervisord]
 nodaemon=true
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisor/supervisord.pid
 
 [program:gunicorn]
 command=/usr/local/bin/gunicorn application:application -w 1 --worker-class eventlet --config /src/gunicorn.conf --log-config /src/logging.conf --bind 0.0.0.0:5000
 directory=/src
-stdout_logfile=/var/log/supervisor/stdout.log
-stderr_logfile=/var/log/supervisor/stderr.log
+# Uncomment the following lines and comment those after if you want to
+# save stdout and stderr logs in seperate files.
+# stdout_logfile=/var/log/supervisor/elastichq_stdout.log
+# stderr_logfile=/var/log/supervisor/elastichq_stderr.log
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true

docs/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: fd1e7fa5cfedfe6f8f3e6bb6c5e9d514
+config: 975bbf0704e836cd18ad12bc8c255959
 tags: 645f666f9bcd5a90fca523b33c5a78b7