merge conflict on readme

This commit is contained in:
xnuinside
2020-07-21 11:01:37 +03:00

View File

@@ -22,14 +22,16 @@ Create pool with name 'default_pool' and slots, for example 100 or 1000.
Source files for article with description on Medium.
Apache Airflow with LocalExecutor:
**Apache Airflow with LocalExecutor:**
<https://medium.com/@xnuinside/quick-guide-how-to-run-apache-airflow-cluster-in-docker-compose-615eb8abd67a>
Apache Airflow with CeleryExecutor:
**Apache Airflow with CeleryExecutor:**
<https://medium.com/@xnuinside/quick-tutorial-apache-airflow-with-3-celery-workers-in-docker-composer-9f2f3b445e4>
Install Python dependencies to docker-compose cluster without re-build images
**Install Python dependencies to docker-compose cluster without re-build images**
<https://medium.com/@xnuinside/install-python-dependencies-to-docker-compose-cluster-without-re-build-images-8c63a431e11c>
![Main Apache Airflow UI](/docs/img/main.png?raw=true "Main Apache Airflow UI")
![Version](/docs/img/version.png?raw=true "Version Screen")
@@ -37,8 +39,11 @@ Install Python dependencies to docker-compose cluster without re-build images
1. Docker Compose files with puckel images moved to docker_with_puckel_image
2. Added docker-compose-with-celery.yml based on official image.
### From 29.11.2019:
### 18.12.19 changes:
1. added samples for article https://medium.com/@xnuinside/install-python-dependencies-to-docker-compose-cluster-without-re-build-images-8c63a431e11c (docker-compose-volume-packages.yml, packages.pth, added commented lines to Dockerfile)
2. added .dockerignore
### 29.11.19 changes:
1. Apache Airflow Image was updated to version 1.10.6
2. Added test_dag into airflow_files