Docker files

Dockerfile

@@ -1,15 +1,17 @@
 FROM python:3.5.2
 
+MAINTAINER [email protected]
+
 COPY requirements.txt /app/requirements.txt
 COPY production.ini-TEMPLATE /app/production.ini-TEMPLATE
 COPY docker/generate_production_ini.py /app/docker/generate_production_ini.py
 COPY docker/entrypoint.sh /app/docker/entrypoint.sh
+COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 WORKDIR /app
 
 RUN pip install -r requirements.txt
 RUN pip install gunicorn
-RUN python docker/generate_production_ini.py
 
 ENV PUBLICATIONSTATS_SETTINGS_FILE=/app/production.ini
 

docker-compose.yml

@@ -7,5 +7,6 @@ services:
     restart: always
     ports:
       - "11620:11620"
+      - "8000:8000"
     links:
       - org.scielo.publication_stats_thriftserver:org.scielo.publication_stats_thriftserver

docker/entrypoint.sh

@@ -3,7 +3,7 @@ set -e
 
 # inicia o webserver:
 cd /app
-gunicorn --paste production.ini -w 4 -b 0.0.0.0 --daemon
 
-# inicia o thirft server
-publicationstats_thriftserver --port 11620 --host 0.0.0.0
+python docker/generate_production_ini.py
+
+/usr/bin/supervisord

docker/generate_production_ini.py

@@ -3,14 +3,13 @@
 from configparser import ConfigParser
 
 PROJECT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-WEBAPP_PORT = '8000'  # ver ports: docker-compose.yml e Dockerfile
 production_template_ini_filepath = os.path.join(PROJECT_PATH + '/production.ini-TEMPLATE')
 new_production_ini_filepath = os.path.join(PROJECT_PATH + '/production.ini')
 config = ConfigParser()
 config.read_file(open(production_template_ini_filepath))
-config.set('app:main', 'elasticsearch', os.environ.get('ELASTICSEARCH', 'esd.scielo.org:9200'))
-config.set('app:main', 'articlemeta', os.environ.get('ARTICLEMETA', 'esd.scielo.org:9200'))
-config.set('server:main', 'port', WEBAPP_PORT)
+config.set('app:main', 'elasticsearch', os.environ.get('ELASTICSEARCH', '127.0.0.1:9200'))
+config.set('app:main', 'articlemeta', os.environ.get('ARTICLEMETA', 'articlemeta.scielo.org:11720'))
+config.set('server:main', 'port', '8000')
 
-with open(new_production_ini_filepath, 'w') as configfile:    # save
+with open(new_production_ini_filepath, 'w') as configfile:
     config.write(configfile)

requirements.txt

@@ -5,4 +5,4 @@ thriftpy==0.3.1
 pyramid==1.5.7
 -e git+https://github.com/scieloorg/[email protected]#egg=xylose
 -e git+https://github.com/scieloorg/[email protected]#egg=thriftpywrap
--e git+https://github.com/scieloorg/publication_stats@0.5.5#egg=publication_stats
+-e git+https://github.com/scieloorg/publication_stats@docker#egg=publication_stats

setup.py

@@ -27,7 +27,7 @@
 
 setup(
     name="publication",
-    version='0.5.5',
+    version='0.6.5',
     description="A SciELO RPC server and API to retrieve publication statistics from the SciELO Network ",
     author="SciELO",
     author_email="[email protected]",