diff --git a/README.md b/README.md index 59b2f655572adf2a02ba05ba878666d89ef9c793..5c7f1f8d05f486a1d54d525bb9eddc7156608a14 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ eFlows4HPC Data Logistics Service ``` -mkdir ./logs ./plugins -echo -e "AIRFLOW_UID=$(id -u)\nAIRFLOW_GID=0" > .env +mkdir ./logs +echo -e "AIRFLOW_UID=$(id -u)" > .env reqs=`cat requirements.txt | tr '\n' ' '` echo "_PIP_ADDITIONAL_REQUIREMENTS=$reqs" >> .env diff --git a/dockers/docker-compose.yaml b/dockers/docker-compose.yaml index a5377534032bddf9ec34c0890f35126e430ecf92..3102c35e738818afff0b8ac2d4eec21ff8e51b93 100644 --- a/dockers/docker-compose.yaml +++ b/dockers/docker-compose.yaml @@ -56,7 +56,6 @@ x-airflow-common: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION: 'true' AIRFLOW__CORE__LOAD_EXAMPLES: 'false' AIRFLOW__API__AUTH_BACKEND: 'airflow.api.auth.backend.basic_auth' - _AIRFLOW_WWW_USER_PASSWORD: 'somepass' _PIP_ADDITIONAL_REQUIREMENTS: ${_PIP_ADDITIONAL_REQUIREMENTS:-} volumes: - ./dags:/opt/airflow/dags @@ -253,17 +252,19 @@ services: - -c - airflow - flower: + airflow-setup: <<: *airflow-common - command: celery flower - ports: - - 5555:5555 - healthcheck: - test: ["CMD", "curl", "--fail", "http://localhost:5555/"] - interval: 10s - timeout: 10s - retries: 5 - restart: always + environment: + <<: *airflow-common-env + CONNECTION_CHECK_MAX_COUNT: "0" + # Workaround for entrypoint issue. See: https://github.com/apache/airflow/issues/16252 + command: + - airflow + - connections + - add + - 'my_conn' + - --conn-uri + - "http://www.ooo.aaa" depends_on: <<: *airflow-common-depends-on airflow-init: diff --git a/requirements.txt b/requirements.txt index 240d00f906211bb0f8dad8dc7426a58b99fea37f..aeecd2f8a68c7beca6f3259e5c3642f6349f8984 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ requests urllib3==1.26.6 +plyvel apache-airflow-providers-ssh apache-airflow-providers-http apache-airflow-providers-sftp