From 25cbbbe042b7592c9eaa7af08b1738964ec95382 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 10 Jan 2025 16:06:09 +0900 Subject: [PATCH] Elasticsearch moved to dedicated profile in compose files --- compose_databases.yaml | 3 +-- docker-compose_v3_alpine_mysql_latest.yaml | 8 ++++---- docker-compose_v3_alpine_mysql_local.yaml | 8 ++++---- docker-compose_v3_alpine_pgsql_latest.yaml | 8 ++++---- docker-compose_v3_alpine_pgsql_local.yaml | 8 ++++---- docker-compose_v3_centos_mysql_latest.yaml | 8 ++++---- docker-compose_v3_centos_mysql_local.yaml | 8 ++++---- docker-compose_v3_centos_pgsql_latest.yaml | 8 ++++---- docker-compose_v3_centos_pgsql_local.yaml | 8 ++++---- docker-compose_v3_ol_mysql_latest.yaml | 8 ++++---- docker-compose_v3_ol_mysql_local.yaml | 8 ++++---- docker-compose_v3_ol_pgsql_latest.yaml | 8 ++++---- docker-compose_v3_ol_pgsql_local.yaml | 8 ++++---- docker-compose_v3_ubuntu_mysql_latest.yaml | 8 ++++---- docker-compose_v3_ubuntu_mysql_local.yaml | 8 ++++---- docker-compose_v3_ubuntu_pgsql_latest.yaml | 8 ++++---- docker-compose_v3_ubuntu_pgsql_local.yaml | 8 ++++---- 17 files changed, 65 insertions(+), 66 deletions(-) diff --git a/compose_databases.yaml b/compose_databases.yaml index c04ec5db3..8e392bb6b 100644 --- a/compose_databases.yaml +++ b/compose_databases.yaml @@ -78,8 +78,7 @@ services: restart: "${RESTART_POLICY}" attach: false profiles: - - full - - all + - elasticsearch environment: - transport.host=0.0.0.0 - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 19bcd18e9..d310cf6d7 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -131,10 +131,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 3ab2ceb35..dc7a23371 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -214,10 +214,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index 3dc781b60..71cac7088 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -145,10 +145,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 4894709b4..40084f433 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -241,10 +241,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 510d018bb..de0954c62 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -131,10 +131,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index ee74d08f8..9122f68b2 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -214,10 +214,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index ce881a602..4541020d6 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -145,10 +145,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 2ada8c3b5..6aba78165 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -240,10 +240,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index 71a4dfeca..a9d89dff3 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -131,10 +131,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 8169c09ea..8930afdc7 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -214,10 +214,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index fdc5dcbb7..3ce769ff5 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -145,10 +145,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index fa6065037..121ea32f6 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -241,10 +241,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index 808bcc276..9c2739364 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -115,10 +115,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 39a8ad510..442dfd5e7 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -202,10 +202,10 @@ services: file: compose_databases.yaml service: db-data-mysql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 7a676caa3..6090c286f 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -129,10 +129,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index a57f8282f..83b53122a 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -235,10 +235,10 @@ services: file: compose_databases.yaml service: db-data-pgsql -# elasticsearch: -# extends: -# file: compose_databases.yaml -# service: elasticsearch + elasticsearch: + extends: + file: compose_databases.yaml + service: elasticsearch networks: frontend: