diff --git a/cloud/google/manager.py b/cloud/google/manager.py index 9e21f62f..b4d89081 100644 --- a/cloud/google/manager.py +++ b/cloud/google/manager.py @@ -78,8 +78,6 @@ def GenerateManagerStartupScript(context, hostname_manager, hostname_nfs_server) systemctl start cron.service echo "0 0 * * * docker system prune -f"|crontab - -docker swarm init - wget -O compose.yml {context.properties["composeLocation"]} echo "[rabbitmq_management,rabbitmq_prometheus]." > /enabled_plugins @@ -93,7 +91,8 @@ def GenerateManagerStartupScript(context, hostname_manager, hostname_nfs_server) until mount {hostname_nfs_server}:/share /share; do sleep 60; done''' startup_script +=f''' -docker stack deploy --with-registry-auth -c compose.yml {context.env["deployment"]} + +docker compose --project-directory /airflow -f /compose.yml up -d iptables -I INPUT -p tcp --dport 6379 -j DROP iptables -I INPUT -p tcp --dport 6379 -s 172.16.0.0/12 -j ACCEPT @@ -105,9 +104,9 @@ def GenerateManagerStartupScript(context, hostname_manager, hostname_nfs_server) while true do if [ $(curl -s "http://metadata/computeMetadata/v1/instance/attributes/redeploy" -H "Metadata-Flavor: Google") == "true" ]; then - docker stack rm {context.env["deployment"]} - sleep 120 - docker stack deploy --with-registry-auth -c compose.yml {context.env["deployment"]} + docker compose --project-directory /airflow -f /compose.yml down + docker pull "$SEURON_TAG" + docker compose --project-directory /airflow -f /compose.yml up -d sleep 300 else sleep 60