diff --git a/dockers/docker-compose.yaml b/dockers/docker-compose.yaml index ec272d42770ee499534958698813eceb2c9db792..0204d0792e70c0c8cb5656e6d3dd619fe3ba51e4 100644 --- a/dockers/docker-compose.yaml +++ b/dockers/docker-compose.yaml @@ -88,21 +88,21 @@ services: - "80:80" - "443:443" -# letsencrypt: -# image: "jrcs/letsencrypt-nginx-proxy-companion:latest" -# container_name: "letsencrypt-helper" -# volumes: -# - "html:/usr/share/nginx/html" -# - "dhparam:/etc/nginx/dhparam" -# - "vhost:/etc/nginx/vhost.d" -# - "certs:/etc/nginx/certs" -# - "/run/docker.sock:/var/run/docker.sock:ro" -# environment: -# NGINX_PROXY_CONTAINER: "reverse-proxy" -# DEFAULT_EMAIL: "m.petrova@fz-juelich.de" -# restart: "always" -# depends_on: -# - "reverse-proxy" + letsencrypt: + image: "jrcs/letsencrypt-nginx-proxy-companion:latest" + container_name: "letsencrypt-helper" + volumes: + - "html:/usr/share/nginx/html" + - "dhparam:/etc/nginx/dhparam" + - "vhost:/etc/nginx/vhost.d" + - "certs:/etc/nginx/certs" + - "/run/docker.sock:/var/run/docker.sock:ro" + environment: + NGINX_PROXY_CONTAINER: "reverse-proxy" + DEFAULT_EMAIL: "m.petrova@fz-juelich.de" + restart: "always" + depends_on: + - "reverse-proxy" postgres: image: postgres:13 diff --git a/scripts/deployment.sh b/scripts/deployment.sh index 71c4fab314a6166cdd591eee81867361d6c8214f..f83ba9eea765d619d4dfafec63dcb50383c70abe 100755 --- a/scripts/deployment.sh +++ b/scripts/deployment.sh @@ -21,7 +21,7 @@ if [ -z ${6+x} ]; then unset AIRFLOW__CORE__FERNET_KEY; else export AIRFLOW__COR echo "DEBUG values: OLD_DIR=$OLD_DIR, ENTRYPOINT_DIR=$ENTRYPOINT and GIT_REPO=$GIT_REPO" echo "DEBUG using secrets backend: $AIRFLOW__SECRETS__BACKEND" echo "DEBUG backend args length: ${#AIRFLOW__SECRETS__BACKEND_KWARGS}" -echo "DEBUG fernet key: ${AIRFLOW__CORE__FERNET_KEY}" +#echo "DEBUG fernet key: ${AIRFLOW__CORE__FERNET_KEY}" cd $ENTRYPOINT @@ -32,6 +32,9 @@ AIRFLOW_DIR=`pwd` echo "Project dir is set to: $AIRFLOW_DIR" echo "Proceeding as user $(whoami)" +# clean out the target directory to ensure only new stuff is there +rm -rf $AIRFLOW_DIR/* + # Make the necessary folders for the airflow artefacts and copy the corresponging content mkdir -p ./dags ./logs ./plugins ./config ./templates cd $GIT_REPO