From 924a1e5987e31d0a8800ab091c1b91b0c216a8c0 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Mon, 28 Feb 2022 09:50:52 +0100 Subject: [PATCH] chore: Update Compose file version to 3.7 Allows enabling the 'init' option in the 'setup' service. Requires Docker 18.06.0 and Compose 1.22.0. --- README.md | 4 ++-- docker-compose.yml | 3 ++- extensions/apm-server/apm-server-compose.yml | 2 +- extensions/curator/curator-compose.yml | 2 +- extensions/enterprise-search/enterprise-search-compose.yml | 2 +- extensions/filebeat/filebeat-compose.yml | 2 +- extensions/logspout/logspout-compose.yml | 2 +- extensions/metricbeat/metricbeat-compose.yml | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2854711..ffe4c9b 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,8 @@ own_. [sherifabdlnaby/elastdocker][elastdocker] is one example among others of p ### Host setup -* [Docker Engine](https://docs.docker.com/install/) version **17.05** or newer -* [Docker Compose](https://docs.docker.com/compose/install/) version **1.20.0** or newer +* [Docker Engine](https://docs.docker.com/install/) version **18.06.0** or newer +* [Docker Compose](https://docs.docker.com/compose/install/) version **1.22.0** or newer * 1.5 GB of RAM *:information_source: Especially on Linux, make sure your user has the [required permissions][linux-postinstall] to diff --git a/docker-compose.yml b/docker-compose.yml index b9e02c6..1f85ef6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.7' services: @@ -14,6 +14,7 @@ services: context: setup/ args: ELASTIC_VERSION: ${ELASTIC_VERSION} + init: true volumes: - setup:/state:Z environment: diff --git a/extensions/apm-server/apm-server-compose.yml b/extensions/apm-server/apm-server-compose.yml index b951d4b..9d5d2b1 100644 --- a/extensions/apm-server/apm-server-compose.yml +++ b/extensions/apm-server/apm-server-compose.yml @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.7' services: apm-server: diff --git a/extensions/curator/curator-compose.yml b/extensions/curator/curator-compose.yml index 60786a6..488cd80 100644 --- a/extensions/curator/curator-compose.yml +++ b/extensions/curator/curator-compose.yml @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.7' services: curator: diff --git a/extensions/enterprise-search/enterprise-search-compose.yml b/extensions/enterprise-search/enterprise-search-compose.yml index 5b9e9fe..f6df917 100644 --- a/extensions/enterprise-search/enterprise-search-compose.yml +++ b/extensions/enterprise-search/enterprise-search-compose.yml @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.7' services: enterprise-search: diff --git a/extensions/filebeat/filebeat-compose.yml b/extensions/filebeat/filebeat-compose.yml index 020336e..04ff104 100644 --- a/extensions/filebeat/filebeat-compose.yml +++ b/extensions/filebeat/filebeat-compose.yml @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.7' services: filebeat: diff --git a/extensions/logspout/logspout-compose.yml b/extensions/logspout/logspout-compose.yml index bb60bef..a603c3f 100644 --- a/extensions/logspout/logspout-compose.yml +++ b/extensions/logspout/logspout-compose.yml @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.7' services: logspout: diff --git a/extensions/metricbeat/metricbeat-compose.yml b/extensions/metricbeat/metricbeat-compose.yml index 7777887..da62833 100644 --- a/extensions/metricbeat/metricbeat-compose.yml +++ b/extensions/metricbeat/metricbeat-compose.yml @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.7' services: metricbeat: