Skip to content

Commit

Permalink
fixed foxmask#290
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxMaSk committed Jun 7, 2018
1 parent 8e3e1d7 commit 8a7170e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM redis:3.2.6
FROM postgres:9.6
FROM python:3.6
MAINTAINER FoxMaSk <[email protected]>
MAINTAINER FoxMaSk
ENV PYTHONUNBUFFERED 1
RUN mkdir /app
WORKDIR /app
Expand All @@ -12,4 +12,4 @@ COPY . /app/


#EXPOSE 8000
#CMD ["python", "manage.py", "runserver", "0.0.0.0:8000", "--settings=django_th.settings_docker"]
#CMD ["python", "manage.py", "runserver", "0.0.0.0:8000", "--settings=django_th.settings_docker"]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of wallabag_api nor the names of its
* Neither the name of django-th / trigger happy nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

Expand Down
2 changes: 1 addition & 1 deletion django_th/settings_docker.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .settings import *
from .th_settings import *

DATABASES = {
'default': {
Expand Down

0 comments on commit 8a7170e

Please sign in to comment.