diff --git a/docker-compose/airflow/docker-compose.yml b/docker-compose/airflow/docker-compose.yml index 7d500d7..941be83 100644 --- a/docker-compose/airflow/docker-compose.yml +++ b/docker-compose/airflow/docker-compose.yml @@ -42,7 +42,7 @@ x-airflow-common: # image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.0.2} # image: harbor.ukserp.ac.uk/dare/airflow/dags:pr-73 #1.4.4 # image: harbor.ukserp.ac.uk/dlm/airflow/dags:1.14.1 - image: harbor.ukserp.ac.uk/dlm/airflow/dags:pr-114 + image: harbor.ukserp.ac.uk/dlm/airflow/dags:1.20.0 environment: &airflow-common-env AIRFLOW__CORE__EXECUTOR: CeleryExecutor diff --git a/docker-compose/minio-trino/rabbitmq/definitions.json b/docker-compose/minio-trino/rabbitmq/definitions.json index 373b255..833f674 100644 --- a/docker-compose/minio-trino/rabbitmq/definitions.json +++ b/docker-compose/minio-trino/rabbitmq/definitions.json @@ -87,6 +87,15 @@ } }, + { + "name":"request_schema_save", + "vhost":"/", + "durable":true, + "auto_delete":false, + "arguments":{ + + } + }, { "name":"audit_raw", "vhost":"/", @@ -130,6 +139,15 @@ "auto_delete":false, "arguments":{ + } + }, + { + "name":"return_schema", + "vhost":"/", + "durable":true, + "auto_delete":false, + "arguments":{ + } } ], @@ -173,6 +191,15 @@ "auto_delete":false, "internal":false, "arguments":{} + }, + { + "name":"schemaOutput", + "vhost":"/", + "type":"fanout", + "durable":true, + "auto_delete":false, + "internal":false, + "arguments":{} } ], "bindings":[ @@ -261,9 +288,28 @@ "vhost":"/", "destination":"request_schema", "destination_type":"queue", - "routing_key":"request", + "routing_key":"", + "arguments":{ + + } + }, + { + "source":"schema", + "vhost":"/", + "destination":"request_schema_save", + "destination_type":"queue", + "routing_key":"", "arguments":{ + } + }, + { + "source":"schemaOutput", + "vhost":"/", + "destination":"return_schema", + "destination_type":"queue", + "routing_key":"request", + "arguments":{ } } ]