diff -Nru biomaj3-process-3.0.8/bin/biomaj_process_consumer.py biomaj3-process-3.0.10/bin/biomaj_process_consumer.py --- biomaj3-process-3.0.8/bin/biomaj_process_consumer.py 2017-08-24 14:15:17.000000000 +0000 +++ biomaj3-process-3.0.10/bin/biomaj_process_consumer.py 2017-12-18 12:14:35.000000000 +0000 @@ -35,7 +35,8 @@ if 'hostname' in config['web']: metric['host'] = config['web']['hostname'] metrics.append(metric) - r = requests.post(config['web']['local_endpoint'] + '/api/process/metrics', json = metrics) + proxy = Utils.get_service_endpoint(config, 'process') + r = requests.post(proxy + '/api/process/metrics', json = metrics) process = ProcessService(config_file) diff -Nru biomaj3-process-3.0.8/biomaj_process/process.py biomaj3-process-3.0.10/biomaj_process/process.py --- biomaj3-process-3.0.8/biomaj_process/process.py 2017-08-24 14:15:17.000000000 +0000 +++ biomaj3-process-3.0.10/biomaj_process/process.py 2017-12-18 12:14:35.000000000 +0000 @@ -220,7 +220,7 @@ data_dir = os.environ['BIOMAJ_DIR'] + '/' + self.bank_env['dirversion'] depends_vol = '' - for vol in depends_vol: + for vol in depends: depends_vol += '-v %s:%s:ro' % (vol, vol) if not self.run_as_root: @@ -248,7 +248,7 @@ else: cmd = ''' {sudo} docker {docker_url} pull {container_id} - {sudo} docker {docker_url} run --rm -w {bank_dir} -v {data_dir}:{data_dir} {env} {container_id} \ + {sudo} docker {docker_url} run --rm -w {bank_dir} {depends_vol} -v {data_dir}:{data_dir} {env} {container_id} \ {exe} {args} \ '''.format( uid=os.getuid(), diff -Nru biomaj3-process-3.0.8/CHANGES.txt biomaj3-process-3.0.10/CHANGES.txt --- biomaj3-process-3.0.8/CHANGES.txt 2017-08-24 14:15:17.000000000 +0000 +++ biomaj3-process-3.0.10/CHANGES.txt 2017-12-18 12:14:35.000000000 +0000 @@ -1,3 +1,9 @@ +3.0.10 + README doc fixes + Add dependency banks additional volumes for Docker +3.0.9: + Allow local_endpoint definition per service + Fix volumes for docker with dependency banks 3.0.8: Fix #1, DRMAA needs colon in front of output and error path (mandatory depending on versions) 3.0.7: diff -Nru biomaj3-process-3.0.8/debian/changelog biomaj3-process-3.0.10/debian/changelog --- biomaj3-process-3.0.8/debian/changelog 2017-08-17 09:59:28.000000000 +0000 +++ biomaj3-process-3.0.10/debian/changelog 2018-02-10 17:17:55.000000000 +0000 @@ -1,3 +1,10 @@ +biomaj3-process (3.0.10-1) unstable; urgency=medium + + * New upstream release + d/control: switch to 4.1.3 + + -- Olivier Sallou Sat, 10 Feb 2018 17:17:55 +0000 + biomaj3-process (3.0.8-1) unstable; urgency=low * First packaging of biomaj-process (Closes: #872447) diff -Nru biomaj3-process-3.0.8/debian/control biomaj3-process-3.0.10/debian/control --- biomaj3-process-3.0.8/debian/control 2017-08-17 09:59:28.000000000 +0000 +++ biomaj3-process-3.0.10/debian/control 2018-02-10 17:17:55.000000000 +0000 @@ -20,7 +20,7 @@ python3-yaml, python3-biomaj3-core, python3-biomaj3-zipkin -Standards-Version: 4.0.0 +Standards-Version: 4.1.3 Homepage: https://github.com/genouest/biomaj-process Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/biomaj3-process.git Vcs-Git: https://anonscm.debian.org/git/debian-med/biomaj3-process.git diff -Nru biomaj3-process-3.0.8/README.md biomaj3-process-3.0.10/README.md --- biomaj3-process-3.0.8/README.md 2017-08-24 14:15:17.000000000 +0000 +++ biomaj3-process-3.0.10/README.md 2017-12-18 12:14:35.000000000 +0000 @@ -38,4 +38,6 @@ export prometheus_multiproc_dir=..path_to/prometheus-multiproc gunicorn -c ..path_to/gunicorn_conf.py biomaj_download.biomaj_process_web:app -Web processes should be behind a proxy/load balancer, API base url /api/download +Web processes should be behind a proxy/load balancer, API base url /api/process + +A prometheus /metrics endpoint is exposed on web server diff -Nru biomaj3-process-3.0.8/requirements.txt biomaj3-process-3.0.10/requirements.txt --- biomaj3-process-3.0.8/requirements.txt 2017-08-24 14:15:17.000000000 +0000 +++ biomaj3-process-3.0.10/requirements.txt 2017-12-18 12:14:35.000000000 +0000 @@ -8,5 +8,5 @@ python-consul prometheus_client>=0.0.18 requests -biomaj_core +biomaj_core>=3.0.10 biomaj_zipkin diff -Nru biomaj3-process-3.0.8/setup.py biomaj3-process-3.0.10/setup.py --- biomaj3-process-3.0.8/setup.py 2017-08-24 14:15:17.000000000 +0000 +++ biomaj3-process-3.0.10/setup.py 2017-12-18 12:14:35.000000000 +0000 @@ -21,7 +21,7 @@ 'url': 'http://biomaj.genouest.org', 'download_url': 'http://biomaj.genouest.org', 'author_email': 'olivier.sallou@irisa.fr', - 'version': '3.0.8', + 'version': '3.0.10', 'classifiers': [ # How mature is this project? Common values are # 3 - Alpha