diff --git a/dockers/README.md b/dockers/README.md new file mode 100644 index 0000000000000000000000000000000000000000..1cb752d4e3d406c64804060e72512cd31d2d0656 --- /dev/null +++ b/dockers/README.md @@ -0,0 +1,13 @@ +# Maintenance for customizations + +### Footer +The DLS Service has a custom footer to contribute to the consortium image of the eFlows Project. The design of the custom footer is part of templates/main.html. This file is being injected as a volume in docker-compose.yaml, thus overriding the existing template from the public airflow image. For testing reasons, the path has been hard-coded in the docker-compose.yaml. + +### Updates + Taking a hard-coded path approach means that with every update of the official airflow image, the currect main.html file has to be pulled anew from the official container. + + For example: + + ```docker exec airflow_airflow-webserver_1 find /home/airflow/ | grep main.html ``` + + Copy this file into the local repository and substitute the ```<footer>``` section with the custom DLS ```%footer%``` block. In case of a new python version in the official airflow image (and container) you will need to adjust the new path in the volume section of the docker-compose.yaml. \ No newline at end of file diff --git a/scripts/cloudinit.yml b/scripts/cloudinit.yml index 73137c7cb172bd9c3ca04f5e34e6998882f1ef0c..3a5e9dae1d3154a0729925aa48c00cbf47177193 100644 --- a/scripts/cloudinit.yml +++ b/scripts/cloudinit.yml @@ -49,16 +49,15 @@ users: runcmd: - 'git clone https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service.git /home/maria/data-logistics-service' - cd /home/maria - - mkdir airflow-testing - - cd airflow-testing + - mkdir airflow + - cd airflow - mkdir -p ./dags ./logs ./plugins ./config ./templates - cp ../data-logistics-service/dags/* ./dags - cp -r ../data-logistics-service/plugins/* ./plugins - cp ../data-logistics-service/config/* ./config - cp ../data-logistics-service/templates/* ./templates - # - echo "AIRFLOW_UID=0\nAIRFLOW_GID=0" > ../data-logistics-service/dockers/.env #for root + - echo -e "AIRFLOW_UID=$(id -u)" > ../data-logistics-service/dockers/.env #for root - export AIRFLOW_UID=$(id -u) - - export AIRFLOW_GID=0 - - docker-compose -f ../data-logistics-service/dockers/docker-compose.yaml --project-directory . --verbose up airflow-init - - docker-compose -f ../data-logistics-service/dockers/docker-compose.yaml --project-directory . up + - docker-compose -f ~/data-logistics-service/dockers/docker-compose.yaml --project-directory ~/airflow --verbose up airflow-init + - docker-compose -f ~/data-logistics-service/dockers/docker-compose.yaml --project-directory ~/airflow . up # - /bin/bash ../data-logistics-service/scripts/deployment.sh .