Skip to content

Commit e7ee485

Browse files
committed
Merge branch 'release/v3.4.1'
2 parents f427f9f + a24f722 commit e7ee485

32 files changed

+444
-216
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apk add --no-cache bash \
1818
# reqs layer
1919
ADD requirements.txt .
2020
RUN pip3 install -U -r requirements.txt
21-
RUN pip3 install gunicorn
21+
RUN pip3 install gunicorn==19.7.1
2222

2323
# Bundle app source
2424
ADD . /src

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For **full** installation and configuration instructions, see [Getting Started](
3939

4040
1. Download or clone the repository.
4141
2. Open terminal and point to root of repository. Type: ``pip install -r requirements.txt``
42-
3. Run server with: `` python application.py ``. Alternatively: ``./manage.py runserver``
42+
3. Run server with: `` python3 application.py ``. Alternatively: ``./manage.py runserver``
4343
4. Access HQ with: `` http://localhost:5000 ``
4444

4545
For further installation and configuration help, please read the docs: [ElasticHQ Documentation](http://docs.elastichq.org)

deployment/supervisord.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ nodaemon=true
33

44
[program:gunicorn]
55
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
6-
directory=/src
6+
directory=/src
7+
stdout_logfile=/var/log/supervisor/stdout.log
8+
stderr_logfile=/var/log/supervisor/stderr.log
27 Bytes
Binary file not shown.

docs/.doctrees/environment.pickle

-6.9 KB
Binary file not shown.

docs/.doctrees/faq.doctree

-39 Bytes
Binary file not shown.

docs/.doctrees/index.doctree

-72 Bytes
Binary file not shown.
14 KB
Binary file not shown.

docs/.doctrees/rest-api.doctree

3.69 KB
Binary file not shown.
-12 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)