Remove duplicated definitions of random volumes (apache#36993)

Docker Compose 2.24 started to error out on duplicated (but otherwise identical) volume definitions coming from multiple docker compose files. We had urandom volume defined not only in base yaml but also in all the backend and integration yaml files which new docker compose does not like (and I agree with it). That resulted with error: ``services.airflow.volumes array items[0,2] must be unique`` This PR removes the duplicated volume definitions, as side effect it makes our docker compose files cleaner.
VladaZakharova · Jan 24, 2024 · 390eacb · 390eacb
1 parent 396402d
commit 390eacb
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 15 deletions.
diff --git a/scripts/ci/docker-compose/backend-mysql.yml b/scripts/ci/docker-compose/backend-mysql.yml
@@ -32,7 +32,6 @@ services:
       - MYSQL_DATABASE=airflow
     volumes:
       - ../mysql/conf.d:/etc/mysql/conf.d:ro
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - mysql-db-volume:/var/lib/mysql
     healthcheck:
       test: ["CMD", "mysql", "-h", "localhost", "-P", "3306", "-u", "root", "-e", "SELECT 1"]

diff --git a/scripts/ci/docker-compose/backend-none.yml b/scripts/ci/docker-compose/backend-none.yml
@@ -20,5 +20,3 @@ services:
     environment:
       - BACKEND=none
       - AIRFLOW__DATABASE__SQL_ALCHEMY_CONN=none-backend://
-    volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
diff --git a/scripts/ci/docker-compose/backend-postgres.yml b/scripts/ci/docker-compose/backend-postgres.yml
@@ -33,7 +33,6 @@ services:
       - POSTGRES_DB=airflow
       - POSTGRES_HOST_AUTH_METHOD=password
     volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - postgres-db-volume:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD", "psql", "-h", "localhost", "-U", "postgres", "-c", "select 1", "airflow"]

diff --git a/scripts/ci/docker-compose/backend-sqlite-no-volume.yml b/scripts/ci/docker-compose/backend-sqlite-no-volume.yml
@@ -20,5 +20,3 @@ services:
     environment:
       - BACKEND=sqlite
       - AIRFLOW__DATABASE__SQL_ALCHEMY_CONN=${SQLITE_URL}
-    volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
diff --git a/scripts/ci/docker-compose/backend-sqlite.yml b/scripts/ci/docker-compose/backend-sqlite.yml
@@ -21,7 +21,6 @@ services:
       - BACKEND=sqlite
       - AIRFLOW__DATABASE__SQL_ALCHEMY_CONN=${SQLITE_URL}
     volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - sqlite-db-volume:/root/airflow/sqlite
 volumes:
   sqlite-db-volume:
diff --git a/scripts/ci/docker-compose/integration-cassandra.yml b/scripts/ci/docker-compose/integration-cassandra.yml
@@ -25,7 +25,6 @@ services:
       HEAP_NEWSIZE: 128M
       MAX_HEAP_SIZE: 256M
     volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - cassandra-db-volume:/var/lib/cassandra
     healthcheck:
       # We use IPv6 variant of the check to workaround the problem with 3.0.26 version

diff --git a/scripts/ci/docker-compose/integration-celery.yml b/scripts/ci/docker-compose/integration-celery.yml
@@ -22,7 +22,6 @@ services:
     labels:
       breeze.description: "Integration required for Celery executor tests."
     volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - rabbitmq-db-volume:/var/lib/rabbitmq
     healthcheck:
       test: rabbitmq-diagnostics -q ping
@@ -33,7 +32,6 @@ services:
   redis:
     image: redis:5.0.1
     volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - redis-db-volume:/data/redis
     ports:
       - "${REDIS_HOST_PORT}:6379"

diff --git a/scripts/ci/docker-compose/integration-kerberos.yml b/scripts/ci/docker-compose/integration-kerberos.yml
@@ -29,7 +29,6 @@ services:
 
     volumes:
       - kerberos-keytabs:/root/kerberos-keytabs
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
 
     environment:
       - KRB5_TRACE=/dev/stderr

diff --git a/scripts/ci/docker-compose/integration-mongo.yml b/scripts/ci/docker-compose/integration-mongo.yml
@@ -22,7 +22,6 @@ services:
     labels:
       breeze.description: "Integration required for MongoDB hooks."
     volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - mongo-db-volume:/data/db
     healthcheck:
       test: echo 'db.runCommand("ping").ok' | mongo localhost:27017/test --quiet

diff --git a/scripts/ci/docker-compose/integration-pinot.yml b/scripts/ci/docker-compose/integration-pinot.yml
@@ -23,8 +23,6 @@ services:
       breeze.description: "Integration required for Apache Pinot hooks."
     ports:
       - "9080:9080"
-    volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
     command: QuickStart -type batch
     healthcheck:
       test: curl -f http://localhost:8000/health

diff --git a/scripts/ci/docker-compose/integration-trino.yml b/scripts/ci/docker-compose/integration-trino.yml
@@ -42,7 +42,6 @@ services:
       - "37778-37786:7778"
 
     volumes:
-      - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
       - ../dockerfiles/krb5-kdc-server/krb5.conf:/etc/krb5.conf:ro
       - trino-db-volume:/data/trino
       - kerberos-keytabs:/home/trino/kerberos-keytabs