public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update dockerfile and change settings.py to support non-containerized local setup

Browse source
This commit is contained in:
Jonathan Math 2020-06-20 01:11:42 -04:00
parent ba948e56f5
commit df48eb50f5
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/Dockerfile
View file

@ -1,10 +1,10 @@
FROM python:2.7-slim
FROM python:3.7-slim
MAINTAINER julien@rottenberg.info
WORKDIR /srv/newsblur
ENV PYTHONPATH=/opt/newsblur
ENV DOCKERBUILD=True
CMD ["gunicorn", "--bind", "0.0.0.0:8000", "wsgi"]
EXPOSE 8000

44
settings.py
View file

@ -566,8 +566,13 @@ SESSION_REDIS_DB = 5
# = Elasticsearch =
# =================
ELASTICSEARCH_FEED_HOSTS = ['db_search_feed:9200']
ELASTICSEARCH_STORY_HOSTS = ['db_search_story:9200']
if os.getenv("DOCKERBUILD"):
ELASTICSEARCH_FEED_HOSTS = ['db_search_feed:9200']
ELASTICSEARCH_STORY_HOSTS = ['db_search_story:9200']
else:
ELASTICSEARCH_FEED_HOSTS = ['127.0.0.1:9200']
ELASTICSEARCH_STORY_HOSTS = ['127.0.0.1:9200']
# ===============
# = Social APIs =
@ -663,12 +668,19 @@ TEMPLATES = [
# =========
# = Mongo =
# =========
if os.getenv("DOCKERBUILD"):
MONGO_DB_DEFAULTS = {
'name': 'newsblur',
'host': '127.0.0.1:27017',
'alias': 'default',
}
else:
MONGO_DB_DEFAULTS = {
'name': 'newsblur',
'host': 'db_mongo:27017',
'alias': 'default',
}
MONGO_DB_DEFAULTS = {
'name': 'newsblur',
'host': 'db_mongo:27017',
'alias': 'default',
}
MONGO_DB = dict(MONGO_DB_DEFAULTS, **MONGO_DB)
# MONGO_URI = 'mongodb://%s' % (MONGO_DB.pop('host'),)
@ -682,11 +694,19 @@ MONGO_DB = dict(MONGO_DB_DEFAULTS, **MONGO_DB)
MONGODB = connect(MONGO_DB.pop('name'), **MONGO_DB)
# MONGODB = connect(host="mongodb://localhost:27017/newsblur", connect=False)
MONGO_ANALYTICS_DB_DEFAULTS = {
'name': 'nbanalytics',
'host': 'db_mongo_analytics:27017',
'alias': 'nbanalytics',
}
if os.getenv("DOCKERBUILD"):
MONGO_ANALYTICS_DB_DEFAULTS = {
'name': 'nbanalytics',
'host': 'db_mongo_analytics:27017',
'alias': 'nbanalytics',
}
else:
MONGO_ANALYTICS_DB_DEFAULTS = {
'name': 'nbanalytics',
'host': '127.0.0.1:27017',
'alias': 'nbanalytics',
}
MONGO_ANALYTICS_DB = dict(MONGO_ANALYTICS_DB_DEFAULTS, **MONGO_ANALYTICS_DB)
# MONGO_ANALYTICS_URI = 'mongodb://%s' % (MONGO_ANALYTICS_DB.pop('host'),)
# MONGOANALYTICSDB = connect(MONGO_ANALYTICS_DB.pop('name'), host=MONGO_ANALYTICS_URI, **MONGO_ANALYTICS_DB)