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 32a490e2cf Remove `version` top-level element from docker compose
files (#33831)
32a490e2cf is described below
commit 32a490e2cf380f57b58f187497352bd4dd49e869
Author: Andrey Anshin <[email protected]>
AuthorDate: Thu Aug 31 01:20:46 2023 +0400
Remove `version` top-level element from docker compose files (#33831)
* Remove `version` top-level element from docker compose files
* Bump recommended version of docker compose and advice to upgrade to newer
one
---
docs/apache-airflow/howto/docker-compose/docker-compose.yaml | 1 -
docs/apache-airflow/howto/docker-compose/index.rst | 6 +++++-
scripts/ci/docker-compose/backend-mssql-docker-volume.yml | 1 -
scripts/ci/docker-compose/backend-mssql-port.yml | 1 -
scripts/ci/docker-compose/backend-mssql-tmpfs-volume.yml | 1 -
scripts/ci/docker-compose/backend-mssql.yml | 1 -
scripts/ci/docker-compose/backend-mysql-port.yml | 1 -
scripts/ci/docker-compose/backend-mysql.yml | 1 -
scripts/ci/docker-compose/backend-postgres-port.yml | 1 -
scripts/ci/docker-compose/backend-postgres.yml | 1 -
scripts/ci/docker-compose/backend-sqlite.yml | 1 -
scripts/ci/docker-compose/base-ports.yml | 1 -
scripts/ci/docker-compose/base.yml | 1 -
scripts/ci/docker-compose/devcontainer-mysql.yml | 1 -
scripts/ci/docker-compose/devcontainer-postgres.yml | 1 -
scripts/ci/docker-compose/devcontainer.yml | 1 -
scripts/ci/docker-compose/files.yml | 1 -
scripts/ci/docker-compose/forward-credentials.yml | 1 -
scripts/ci/docker-compose/ga.yml | 1 -
scripts/ci/docker-compose/integration-cassandra.yml | 1 -
scripts/ci/docker-compose/integration-celery.yml | 1 -
scripts/ci/docker-compose/integration-kafka.yml | 1 -
scripts/ci/docker-compose/integration-kerberos.yml | 1 -
scripts/ci/docker-compose/integration-mongo.yml | 1 -
scripts/ci/docker-compose/integration-otel.yml | 1 -
scripts/ci/docker-compose/integration-pinot.yml | 1 -
scripts/ci/docker-compose/integration-statsd.yml | 1 -
scripts/ci/docker-compose/integration-trino.yml | 1 -
scripts/ci/docker-compose/local-all-sources.yml | 1 -
scripts/ci/docker-compose/local.yml | 1 -
scripts/ci/docker-compose/mypy.yml | 1 -
scripts/ci/docker-compose/remove-sources.yml | 1 -
32 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/docs/apache-airflow/howto/docker-compose/docker-compose.yaml
b/docs/apache-airflow/howto/docker-compose/docker-compose.yaml
index 2fcdbaa407..baeb4808be 100644
--- a/docs/apache-airflow/howto/docker-compose/docker-compose.yaml
+++ b/docs/apache-airflow/howto/docker-compose/docker-compose.yaml
@@ -44,7 +44,6 @@
#
# Feel free to modify this file to suit your needs.
---
-version: '3.8'
x-airflow-common:
&airflow-common
# In order to add custom dependencies or upgrade provider packages you can
use your extended image.
diff --git a/docs/apache-airflow/howto/docker-compose/index.rst
b/docs/apache-airflow/howto/docker-compose/index.rst
index 696c83c765..009302d579 100644
--- a/docs/apache-airflow/howto/docker-compose/index.rst
+++ b/docs/apache-airflow/howto/docker-compose/index.rst
@@ -35,7 +35,7 @@ This procedure assumes familiarity with Docker and Docker
Compose. If you haven'
Follow these steps to install the necessary tools, if you have not already
done so.
1. Install `Docker Community Edition (CE)
<https://docs.docker.com/engine/installation/>`__ on your workstation.
Depending on your OS, you may need to configure Docker to use at least 4.00 GB
of memory for the Airflow containers to run properly. Please refer to the
Resources section in the `Docker for Windows
<https://docs.docker.com/docker-for-windows/#resources>`__ or `Docker for Mac
<https://docs.docker.com/docker-for-mac/#resources>`__ documentation for more
information.
-2. Install `Docker Compose <https://docs.docker.com/compose/install/>`__
v1.29.1 or newer on your workstation.
+2. Install `Docker Compose <https://docs.docker.com/compose/install/>`__
v2.14.0 or newer on your workstation.
Older versions of ``docker-compose`` do not support all the features required
by the Airflow ``docker-compose.yaml`` file, so double check that your version
meets the minimum version requirements.
@@ -80,6 +80,10 @@ Fetching ``docker-compose.yaml``
curl -LfO '{{ doc_root_url }}docker-compose.yaml'
+.. important::
+ From July 2023 Compose V1 stopped receiving updates.
+ We strongly advise upgrading to a newer version of Docker Compose, supplied
``docker-compose.yaml`` may not function accurately within Compose V1.
+
This file contains several service definitions:
- ``airflow-scheduler`` - The :doc:`scheduler
</administration-and-deployment/scheduler>` monitors all tasks and DAGs, then
triggers the
diff --git a/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
b/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
index dc2b43032e..69736010c2 100644
--- a/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
+++ b/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
mssql:
volumes:
diff --git a/scripts/ci/docker-compose/backend-mssql-port.yml
b/scripts/ci/docker-compose/backend-mssql-port.yml
index c4cb8b47df..dbfd43beba 100644
--- a/scripts/ci/docker-compose/backend-mssql-port.yml
+++ b/scripts/ci/docker-compose/backend-mssql-port.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
mssql:
ports:
diff --git a/scripts/ci/docker-compose/backend-mssql-tmpfs-volume.yml
b/scripts/ci/docker-compose/backend-mssql-tmpfs-volume.yml
index 261875c0a8..ffd258b9b3 100644
--- a/scripts/ci/docker-compose/backend-mssql-tmpfs-volume.yml
+++ b/scripts/ci/docker-compose/backend-mssql-tmpfs-volume.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
# In case of tmpfs backend for docker, mssql fails because TMPFS does not
support
# O_DIRECT parameter for direct writing to the filesystem
diff --git a/scripts/ci/docker-compose/backend-mssql.yml
b/scripts/ci/docker-compose/backend-mssql.yml
index cb36328d61..2696c23e6d 100644
--- a/scripts/ci/docker-compose/backend-mssql.yml
+++ b/scripts/ci/docker-compose/backend-mssql.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/backend-mysql-port.yml
b/scripts/ci/docker-compose/backend-mysql-port.yml
index 81c83560a1..6555a1344e 100644
--- a/scripts/ci/docker-compose/backend-mysql-port.yml
+++ b/scripts/ci/docker-compose/backend-mysql-port.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
mysql:
ports:
diff --git a/scripts/ci/docker-compose/backend-mysql.yml
b/scripts/ci/docker-compose/backend-mysql.yml
index 22ec85dc27..d74a607003 100644
--- a/scripts/ci/docker-compose/backend-mysql.yml
+++ b/scripts/ci/docker-compose/backend-mysql.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/backend-postgres-port.yml
b/scripts/ci/docker-compose/backend-postgres-port.yml
index 19e38b4cca..1ad33875f6 100644
--- a/scripts/ci/docker-compose/backend-postgres-port.yml
+++ b/scripts/ci/docker-compose/backend-postgres-port.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
postgres:
ports:
diff --git a/scripts/ci/docker-compose/backend-postgres.yml
b/scripts/ci/docker-compose/backend-postgres.yml
index 223b6630a8..26731dcec3 100644
--- a/scripts/ci/docker-compose/backend-postgres.yml
+++ b/scripts/ci/docker-compose/backend-postgres.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/backend-sqlite.yml
b/scripts/ci/docker-compose/backend-sqlite.yml
index 13210d0947..d160f819e6 100644
--- a/scripts/ci/docker-compose/backend-sqlite.yml
+++ b/scripts/ci/docker-compose/backend-sqlite.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/base-ports.yml
b/scripts/ci/docker-compose/base-ports.yml
index 9a9be6270e..c68e3b2484 100644
--- a/scripts/ci/docker-compose/base-ports.yml
+++ b/scripts/ci/docker-compose/base-ports.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
ports:
diff --git a/scripts/ci/docker-compose/base.yml
b/scripts/ci/docker-compose/base.yml
index 160e8feec0..17b2a197c8 100644
--- a/scripts/ci/docker-compose/base.yml
+++ b/scripts/ci/docker-compose/base.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
image: ${AIRFLOW_CI_IMAGE_WITH_TAG}
diff --git a/scripts/ci/docker-compose/devcontainer-mysql.yml
b/scripts/ci/docker-compose/devcontainer-mysql.yml
index 207d13275c..7e9bacbe25 100644
--- a/scripts/ci/docker-compose/devcontainer-mysql.yml
+++ b/scripts/ci/docker-compose/devcontainer-mysql.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
mysql:
image: mysql:8.0
diff --git a/scripts/ci/docker-compose/devcontainer-postgres.yml
b/scripts/ci/docker-compose/devcontainer-postgres.yml
index dba0cc1578..e8c037f644 100644
--- a/scripts/ci/docker-compose/devcontainer-postgres.yml
+++ b/scripts/ci/docker-compose/devcontainer-postgres.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
postgres:
image: postgres:10
diff --git a/scripts/ci/docker-compose/devcontainer.yml
b/scripts/ci/docker-compose/devcontainer.yml
index a9fc3d6fa7..59230f1b5b 100644
--- a/scripts/ci/docker-compose/devcontainer.yml
+++ b/scripts/ci/docker-compose/devcontainer.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
stdin_open: true # docker run -i
diff --git a/scripts/ci/docker-compose/files.yml
b/scripts/ci/docker-compose/files.yml
index 3d8038e002..ae6e327d8d 100644
--- a/scripts/ci/docker-compose/files.yml
+++ b/scripts/ci/docker-compose/files.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
volumes:
diff --git a/scripts/ci/docker-compose/forward-credentials.yml
b/scripts/ci/docker-compose/forward-credentials.yml
index 2d6509007a..03a24f4455 100644
--- a/scripts/ci/docker-compose/forward-credentials.yml
+++ b/scripts/ci/docker-compose/forward-credentials.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
# Forwards local credentials to docker image
diff --git a/scripts/ci/docker-compose/ga.yml b/scripts/ci/docker-compose/ga.yml
index 0fcb6d21b0..ee0870c3d8 100644
--- a/scripts/ci/docker-compose/ga.yml
+++ b/scripts/ci/docker-compose/ga.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/integration-cassandra.yml
b/scripts/ci/docker-compose/integration-cassandra.yml
index 953611c1a7..10569ee8ed 100644
--- a/scripts/ci/docker-compose/integration-cassandra.yml
+++ b/scripts/ci/docker-compose/integration-cassandra.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
cassandra:
image: cassandra:3.0
diff --git a/scripts/ci/docker-compose/integration-celery.yml
b/scripts/ci/docker-compose/integration-celery.yml
index 90d83aa44b..918c9cdcf4 100644
--- a/scripts/ci/docker-compose/integration-celery.yml
+++ b/scripts/ci/docker-compose/integration-celery.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
rabbitmq:
image: rabbitmq:3.7
diff --git a/scripts/ci/docker-compose/integration-kafka.yml
b/scripts/ci/docker-compose/integration-kafka.yml
index 3f89a94143..cc0daca1d7 100644
--- a/scripts/ci/docker-compose/integration-kafka.yml
+++ b/scripts/ci/docker-compose/integration-kafka.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
broker:
image: confluentinc/cp-kafka:7.3.0
diff --git a/scripts/ci/docker-compose/integration-kerberos.yml
b/scripts/ci/docker-compose/integration-kerberos.yml
index 9edaa571d0..ec27d952cd 100644
--- a/scripts/ci/docker-compose/integration-kerberos.yml
+++ b/scripts/ci/docker-compose/integration-kerberos.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
kdc-server-example-com:
image: ghcr.io/apache/airflow-krb5-kdc-server:2021.07.04
diff --git a/scripts/ci/docker-compose/integration-mongo.yml
b/scripts/ci/docker-compose/integration-mongo.yml
index 0c41bb3485..33e6b66b55 100644
--- a/scripts/ci/docker-compose/integration-mongo.yml
+++ b/scripts/ci/docker-compose/integration-mongo.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
mongo:
image: mongo:3
diff --git a/scripts/ci/docker-compose/integration-otel.yml
b/scripts/ci/docker-compose/integration-otel.yml
index ab9f4185b4..ccc2be22fe 100644
--- a/scripts/ci/docker-compose/integration-otel.yml
+++ b/scripts/ci/docker-compose/integration-otel.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
otel-collector:
image: otel/opentelemetry-collector-contrib:0.70.0
diff --git a/scripts/ci/docker-compose/integration-pinot.yml
b/scripts/ci/docker-compose/integration-pinot.yml
index 730fd1a2c3..510f6b5cea 100644
--- a/scripts/ci/docker-compose/integration-pinot.yml
+++ b/scripts/ci/docker-compose/integration-pinot.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
pinot:
image: apachepinot/pinot:0.8.0
diff --git a/scripts/ci/docker-compose/integration-statsd.yml
b/scripts/ci/docker-compose/integration-statsd.yml
index 415e473efd..f4e6eadb4c 100644
--- a/scripts/ci/docker-compose/integration-statsd.yml
+++ b/scripts/ci/docker-compose/integration-statsd.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
statsd-exporter:
image: apache/airflow:airflow-statsd-exporter-2020.09.05-v0.17.0
diff --git a/scripts/ci/docker-compose/integration-trino.yml
b/scripts/ci/docker-compose/integration-trino.yml
index 4bdb8fdae3..626769b730 100644
--- a/scripts/ci/docker-compose/integration-trino.yml
+++ b/scripts/ci/docker-compose/integration-trino.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
trino:
image: ghcr.io/apache/airflow-trino:359-2021.07.04
diff --git a/scripts/ci/docker-compose/local-all-sources.yml
b/scripts/ci/docker-compose/local-all-sources.yml
index 1c10879605..eeafc04314 100644
--- a/scripts/ci/docker-compose/local-all-sources.yml
+++ b/scripts/ci/docker-compose/local-all-sources.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
stdin_open: true # docker run -i
diff --git a/scripts/ci/docker-compose/local.yml
b/scripts/ci/docker-compose/local.yml
index 1ae24d8c69..977c97cbc8 100644
--- a/scripts/ci/docker-compose/local.yml
+++ b/scripts/ci/docker-compose/local.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
stdin_open: true # docker run -i
diff --git a/scripts/ci/docker-compose/mypy.yml
b/scripts/ci/docker-compose/mypy.yml
index 7287738690..24138262b4 100644
--- a/scripts/ci/docker-compose/mypy.yml
+++ b/scripts/ci/docker-compose/mypy.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
volumes:
diff --git a/scripts/ci/docker-compose/remove-sources.yml
b/scripts/ci/docker-compose/remove-sources.yml
index 65b5bce495..65ce4489f7 100644
--- a/scripts/ci/docker-compose/remove-sources.yml
+++ b/scripts/ci/docker-compose/remove-sources.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "3.7"
services:
airflow:
# Removes airflow sources from container
