[airflow] branch main updated: Do not restart breeze containers after restart (#26647)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 337146dbff Do not restart breeze containers after restart (#26647)
337146dbff is described below

commit 337146dbff6933bd3819ad173f6878ddc934c419
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Sep 25 21:52:50 2022 +0200

    Do not restart breeze containers after restart (#26647)
    
    In order to avoid initialisation of database and other integrations
    when you are entering/leaving breeze, those are started when breeze
    starts but not stopped when you leave. Then stopping such running
    auxiliary containers should be done with `breeze stop` after you
    are done. However those who do not do it, and will restart their
    machine will find that the containers get restarted.
    
    This has been added as part of #13446 where health-checks are added.
    However "always" was not a good choice. It should have been "on-failure"
---
 scripts/ci/docker-compose/backend-mssql.yml         | 2 +-
 scripts/ci/docker-compose/backend-mysql.yml         | 2 +-
 scripts/ci/docker-compose/backend-postgres.yml      | 2 +-
 scripts/ci/docker-compose/integration-cassandra.yml | 2 +-
 scripts/ci/docker-compose/integration-kerberos.yml  | 2 +-
 scripts/ci/docker-compose/integration-mongo.yml     | 2 +-
 scripts/ci/docker-compose/integration-openldap.yml  | 2 +-
 scripts/ci/docker-compose/integration-pinot.yml     | 2 +-
 scripts/ci/docker-compose/integration-rabbitmq.yml  | 2 +-
 scripts/ci/docker-compose/integration-redis.yml     | 2 +-
 scripts/ci/docker-compose/integration-trino.yml     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/ci/docker-compose/backend-mssql.yml b/scripts/ci/docker-compose/backend-mssql.yml
index f5953a0bfe..877eae2ea9 100644
--- a/scripts/ci/docker-compose/backend-mssql.yml
+++ b/scripts/ci/docker-compose/backend-mssql.yml
@@ -40,7 +40,7 @@ services:
       timeout: 10s
       retries: 10
       start_period: 2m
-    restart: always
+    restart: "on-failure"
   mssqlsetup:
     image: mcr.microsoft.com/mssql/server:${MSSQL_VERSION}
     depends_on:
diff --git a/scripts/ci/docker-compose/backend-mysql.yml b/scripts/ci/docker-compose/backend-mysql.yml
index 990633a557..34e9d34f9e 100644
--- a/scripts/ci/docker-compose/backend-mysql.yml
+++ b/scripts/ci/docker-compose/backend-mysql.yml
@@ -41,7 +41,7 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
-    restart: always
+    restart: "on-failure"
     command: ['mysqld', '--character-set-server=utf8mb4',
               '--collation-server=utf8mb4_unicode_ci']
 volumes:
diff --git a/scripts/ci/docker-compose/backend-postgres.yml b/scripts/ci/docker-compose/backend-postgres.yml
index 8f9ee2dcce..afeb9472f2 100644
--- a/scripts/ci/docker-compose/backend-postgres.yml
+++ b/scripts/ci/docker-compose/backend-postgres.yml
@@ -42,6 +42,6 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
-    restart: always
+    restart: "on-failure"
 volumes:
   postgres-db-volume:
diff --git a/scripts/ci/docker-compose/integration-cassandra.yml b/scripts/ci/docker-compose/integration-cassandra.yml
index b0ad799dbd..953611c1a7 100644
--- a/scripts/ci/docker-compose/integration-cassandra.yml
+++ b/scripts/ci/docker-compose/integration-cassandra.yml
@@ -32,7 +32,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
   airflow:
     environment:
diff --git a/scripts/ci/docker-compose/integration-kerberos.yml b/scripts/ci/docker-compose/integration-kerberos.yml
index 1df0a17f86..9edaa571d0 100644
--- a/scripts/ci/docker-compose/integration-kerberos.yml
+++ b/scripts/ci/docker-compose/integration-kerberos.yml
@@ -49,7 +49,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
   airflow:
     hostname: krb5-machine-example-com
diff --git a/scripts/ci/docker-compose/integration-mongo.yml b/scripts/ci/docker-compose/integration-mongo.yml
index 44fcc7b1ec..0c41bb3485 100644
--- a/scripts/ci/docker-compose/integration-mongo.yml
+++ b/scripts/ci/docker-compose/integration-mongo.yml
@@ -27,7 +27,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
   airflow:
     environment:
diff --git a/scripts/ci/docker-compose/integration-openldap.yml b/scripts/ci/docker-compose/integration-openldap.yml
index 9d12fc39f5..1afe1d21e0 100644
--- a/scripts/ci/docker-compose/integration-openldap.yml
+++ b/scripts/ci/docker-compose/integration-openldap.yml
@@ -33,7 +33,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
   airflow:
     environment:
diff --git a/scripts/ci/docker-compose/integration-pinot.yml b/scripts/ci/docker-compose/integration-pinot.yml
index 70262e1ad7..730fd1a2c3 100644
--- a/scripts/ci/docker-compose/integration-pinot.yml
+++ b/scripts/ci/docker-compose/integration-pinot.yml
@@ -29,7 +29,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
   airflow:
     environment:
diff --git a/scripts/ci/docker-compose/integration-rabbitmq.yml b/scripts/ci/docker-compose/integration-rabbitmq.yml
index 8610cf540d..bf04b4e84f 100644
--- a/scripts/ci/docker-compose/integration-rabbitmq.yml
+++ b/scripts/ci/docker-compose/integration-rabbitmq.yml
@@ -27,7 +27,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
   airflow:
     environment:
diff --git a/scripts/ci/docker-compose/integration-redis.yml b/scripts/ci/docker-compose/integration-redis.yml
index 2b5f136260..abefa80ff3 100644
--- a/scripts/ci/docker-compose/integration-redis.yml
+++ b/scripts/ci/docker-compose/integration-redis.yml
@@ -29,7 +29,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
   airflow:
     environment:
diff --git a/scripts/ci/docker-compose/integration-trino.yml b/scripts/ci/docker-compose/integration-trino.yml
index cabe24b4c1..89fe1eec9b 100644
--- a/scripts/ci/docker-compose/integration-trino.yml
+++ b/scripts/ci/docker-compose/integration-trino.yml
@@ -30,7 +30,7 @@ services:
       interval: 5s
       timeout: 30s
       retries: 50
-    restart: always
+    restart: "on-failure"
 
     ports:
       - "38080:8080"