Merge pull request #122 from EGA-archive/MQ-upgrade

MQ upgrade

deploy/Makefile

@@ -6,7 +6,8 @@ HOSTNAME_DOMAIN=
 
 .PHONY: up down clean ps clean-volumes clean-all images erase purge preflight-check
 
-up: .env private/lega.yml
+lega-up: SELECTED=inbox ingest cleanup db backup1 backup2 save2db archive-db mq dispatcher
+lega-up up: .env private/lega.yml
 	@docker-compose up -d ${SELECTED}
 
 private/lega.yml .env:

deploy/bootstrap/requirements.txt

@@ -1,7 +1,7 @@
-bcrypt==3.1.7
-cffi==1.13.2
+bcrypt==3.2.0
+cffi==1.14.5
 docopt==0.6.2
-pycparser==2.19
-PyYAML==5.4
-ruamel.yaml==0.16.6
-six==1.14.0
+pycparser==2.20
+PyYAML==5.4.1
+ruamel.yaml==0.17.4
+six==1.16.0

deploy/bootstrap/run/cega/conf.py

@@ -25,7 +25,7 @@
 
 config['DEFAULT'] = {}
 config['mq'] = {
-    'version': '3.7.8',
+    'version': '3.8.16',
     'connection': f"amqps://legatest:legatest@cega-mq{HOSTNAME_DOMAIN}:5671/lega",
     'connection_params': cega_connection_params,
     'user': 'legatest',

deploy/bootstrap/run/cega/services.py

@@ -33,7 +33,7 @@
         'cega-mq': {
             'hostname': f'cega-mq{HOSTNAME_DOMAIN}',
             'ports': ["15670:15672", "5670:5671"],
-            'image': 'rabbitmq:3.7.8-management-alpine',
+            'image': 'rabbitmq:3.8.16-management-alpine',
             'container_name': f'cega-mq{HOSTNAME_DOMAIN}',
             'volumes': [
                 './cega-mq-defs.json:/etc/rabbitmq/defs.json',

docs/amqp.rst

@@ -18,11 +18,6 @@ credentials to connect to the Central EGA message broker, henceforth
 called *central broker*. The other LocalEGA components are connected
 to their respective local broker.
 
-.. note:: We pinned the RabbitMQ version to ``3.7.8``, so far, until
-          both the central broker and the local brokers can be
-          upgraded simultaneously to the latest version.
-
-
 For each LocalEGA instance, the central broker configures a ``vhost``,
 and creates the credentials to connect to that ``vhost`` in the form
 of a *username/password* pair. The local brokers then use a connection

ingestion/mq/Dockerfile

@@ -1,4 +1,4 @@
-FROM rabbitmq:3.7.8-management-alpine
+FROM rabbitmq:3.8.16-management-alpine
 
 LABEL maintainer "EGA System Developers"
 LABEL org.label-schema.schema-version="1.0"

ingestion/mq/README.md

@@ -1,6 +1,6 @@
 # LocalEGA internal message broker in a docker image
 
-We use [RabbitMQ 3.7.8](https://hub.docker.com/_/rabbitmq) including the management plugins.
+We use [RabbitMQ 3.8.16](https://hub.docker.com/_/rabbitmq) including the management plugins.
 
 ## Configuration
 

ingestion/requirements.txt

@@ -3,7 +3,7 @@ bcrypt==3.1.7
 boto3==1.11.7
 botocore==1.14.7
 certifi==2020.4.5.1
-cffi==1.14.0
+cffi==1.14.5
 chardet==3.0.4
 crypt4gh==1.5
 cryptography==3.3.2