feat: fixture now configure docker env variables.

feat: fixture now configure docker env variables.

Author: cofin

src/pytest_databases/docker/cockroachdb.py

@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
 from __future__ import annotations
 
+import os
 from typing import TYPE_CHECKING
 
 import psycopg
@@ -44,13 +44,35 @@ async def cockroachdb_responsive(host: str, port: int, database: str, driver_opt
 
 
 @pytest.fixture()
-async def cockroachdb_service(docker_services: DockerServiceRegistry) -> None:
+def cockroachdb_port() -> int:
+    return 26257
+
+
+@pytest.fixture()
+def cockroachdb_database() -> str:
+    return "defaultdb"
+
+
+@pytest.fixture()
+def cockroachdb_driver_opts() -> dict[str, str]:
+    return {"sslmode": "disable"}
+
+
+@pytest.fixture(autouse=False)
+async def cockroachdb_service(
+    docker_services: DockerServiceRegistry,
+    cockroachdb_port: int,
+    cockroachdb_database: str,
+    cockroachdb_driver_opts: dict[str, str],
+) -> None:
+    os.environ["COCKROACHDB_DATABASE"] = cockroachdb_database
+    os.environ["COCKROACHDB_PORT"] = str(cockroachdb_port)
     await docker_services.start(
         "cockroachdb",
         timeout=60,
         pause=1,
         check=cockroachdb_responsive,
-        port=26257,
-        database="defaultdb",
-        driver_opts={"sslmode": "disable"},
+        port=cockroachdb_port,
+        database=cockroachdb_database,
+        driver_opts=cockroachdb_driver_opts,
     )

src/pytest_databases/docker/docker-compose.yml

@@ -4,128 +4,128 @@ services:
       - default
     image: postgres:12
     ports:
-      - "5423:5432" # use a non-standard port here
+      - "${POSTGRES12_PORT}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: super-secret
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
   postgres13:
     networks:
       - default
     image: postgres:13
     ports:
-      - "5424:5432" # use a non-standard port here
+      - "${POSTGRES13_PORT}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: super-secret
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
   postgres14:
     networks:
       - default
     image: postgres:14
     ports:
-      - "5425:5432" # use a non-standard port here
+      - "${POSTGRES14_PORT}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: super-secret
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
   postgres15:
     networks:
       - default
     image: postgres:15
     ports:
-      - "5426:5432" # use a non-standard port here
+      - "${POSTGRES15_PORT}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: super-secret
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
   postgres16:
     networks:
       - default
     image: postgres:16
     ports:
-      - "5427:5432" # use a non-standard port here
+      - "${POSTGRES16_PORT}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: super-secret
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
   mariadb113:
     networks:
       - default
     image: mariadb:11.3
     ports:
-      - "3359:3306" # use a non-standard port here
+      - "${MARIADB113_PORT}:3306" # use a non-standard port here
     environment:
-      MARIADB_ROOT_PASSWORD: super-secret
-      MARIADB_PASSWORD: super-secret
-      MARIADB_USER: app
-      MARIADB_DATABASE: db
+      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
+      MARIADB_USER: ${MARIADB_USER}
+      MARIADB_DATABASE: ${MARIADB_DATABASE}
       MARIADB_ROOT_HOST: "%"
       LANG: C.UTF-8
   mysql8:
     networks:
       - default
     image: mysql:latest
     ports:
-      - "3360:3306" # use a non-standard port here
+      - "${MYSQL8_PORT}:3306" # use a non-standard port here
     environment:
-      MYSQL_ROOT_PASSWORD: super-secret
-      MYSQL_PASSWORD: super-secret
-      MYSQL_USER: app
-      MYSQL_DATABASE: db
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_ROOT_HOST: "%"
       LANG: C.UTF-8
   mysql57:
     networks:
       - default
     image: mysql:5.7
     ports:
-      - "3362:3306" # use a non-standard port here
+      - "${MYSQL57_PORT}:3306" # use a non-standard port here
     environment:
-      MYSQL_ROOT_PASSWORD: super-secret
-      MYSQL_PASSWORD: super-secret
-      MYSQL_USER: app
-      MYSQL_DATABASE: db
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_ROOT_HOST: "%"
       LANG: C.UTF-8
   mysql56:
     networks:
       - default
     image: mysql:5.6
     ports:
-      - "3363:3306" # use a non-standard port here
+      - "${MYSQL56_PORT}:3306" # use a non-standard port here
     environment:
-      MYSQL_ROOT_PASSWORD: super-secret
-      MYSQL_PASSWORD: super-secret
-      MYSQL_USER: app
-      MYSQL_DATABASE: db
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_ROOT_HOST: "%"
       LANG: C.UTF-8
   oracle18c:
     networks:
       - default
     image: gvenzl/oracle-xe:18-slim-faststart
     ports:
-      - "1514:1521" # use a non-standard port here
+      - "${ORACLE18C_PORT}:1521" # use a non-standard port here
     environment:
-      ORACLE_PASSWORD: super-secret
-      APP_USER_PASSWORD: super-secret
-      APP_USER: app
+      ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD}
+      APP_USER_PASSWORD: ${ORACLE_PASSWORD}
+      APP_USER: ${ORACLE_USER}
   oracle23c:
     networks:
       - default
     image: gvenzl/oracle-free:23-slim-faststart
     ports:
-      - "1513:1521" # use a non-standard port here
+      - "${ORACLE23C_PORT}:1521" # use a non-standard port here
     environment:
-      ORACLE_PASSWORD: super-secret
-      APP_USER_PASSWORD: super-secret
-      APP_USER: app
+      ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD}
+      APP_USER_PASSWORD: ${ORACLE_PASSWORD}
+      APP_USER: ${ORACLE_USER}
   mssql2022:
     networks:
       - default
     image: mcr.microsoft.com/mssql/server:2022-latest
     ports:
-      - "4133:1433" # use a non-standard port here
+      - "${MSSQL2022_PORT:-4133}:1433" # use a non-standard port here
     environment:
-      SA_PASSWORD: Super-secret1
+      SA_PASSWORD: ${MSSQL_PASSWORD:-Super-secret1}
       MSSQL_PID: Developer
       ACCEPT_EULA: Accepted
       MSSQL_TCP_PORT: 1433
   spanner:
     image: gcr.io/cloud-spanner-emulator/emulator:latest
     ports:
-      - "9010:9010"
+      - "${SPANNER_PORT}:9010"
   # Init (Create Instance)
   spanner_init:
     image: gcr.io/google.com/cloudsdktool/cloud-sdk:332.0.0-slim
@@ -136,9 +136,9 @@ services:
               gcloud config set auth/disable_credentials true &&
               gcloud spanner instances create $${INSTANCE_NAME} --config=emulator-config --description=Emulator --nodes=1'
     environment:
-      PROJECT_ID: emulator-test-project
-      INSTANCE_NAME: test-instance
-      DATABASE_NAME: test-database
+      PROJECT_ID: ${GOOGLE_CLOUD_PROJECT}
+      INSTANCE_NAME: ${SPANNER_INSTANCE}
+      DATABASE_NAME: ${SPANNER_DATABASE}
     depends_on:
       - spanner
   cockroachdb:
@@ -147,9 +147,9 @@ services:
     restart: "no"
     expose:
       - "8080"
-      - "26257"
+      - "${COCKROACHDB_PORT}"
     ports:
-      - "26257:26257"
+      - "${COCKROACHDB_PORT}:26257"
       - "8880:8080"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/health?ready=1"]
@@ -159,17 +159,17 @@ services:
   redis:
     image: redis
     ports:
-      - "6397:6379"
+      - "${REDIS_PORT}:6379"
   keydb:
     image: eqalpha/keydb
     ports:
-      - "6396:6379"
+      - "${KEYDB_PORT}:6379"
   dragonfly:
     image: "docker.dragonflydb.io/dragonflydb/dragonfly"
     ulimits:
       memlock: -1
     ports:
-      - "6398:6379"
+      - "${DRAGONFLY_PORT}:6379"
     # For better performance, consider `host` mode instead `port` to avoid docker NAT.
     # `host` mode is NOT currently supported in Swarm Mode.
     # https://docs.docker.com/compose/compose-file/compose-file-v3/#network_mode

src/pytest_databases/docker/dragonfly.py

@@ -23,6 +23,7 @@
 
 from __future__ import annotations
 
+import os
 from typing import TYPE_CHECKING
 
 import pytest
@@ -50,4 +51,5 @@ def dragonfly_port() -> int:
 
 @pytest.fixture(autouse=False)
 async def dragonfly_service(docker_services: DockerServiceRegistry, dragonfly_port: int) -> None:
+    os.environ["DRAGONFLY_PORT"] = str(dragonfly_port)
     await docker_services.start("dragonfly", check=dragonfly_responsive, port=dragonfly_port)

src/pytest_databases/docker/keydb.py

@@ -23,6 +23,7 @@
 
 from __future__ import annotations
 
+import os
 from typing import TYPE_CHECKING
 
 import pytest
@@ -50,4 +51,5 @@ def keydb_port() -> int:
 
 @pytest.fixture(autouse=False)
 async def keydb_service(docker_services: DockerServiceRegistry, keydb_port: int) -> None:
+    os.environ["KEYDB_PORT"] = str(keydb_port)
     await docker_services.start("keydb", check=keydb_responsive, port=keydb_port)

src/pytest_databases/docker/mariadb.py

@@ -23,6 +23,8 @@
 
 from __future__ import annotations
 
+import contextlib
+import os
 from typing import TYPE_CHECKING
 
 import asyncmy
@@ -50,7 +52,8 @@ async def mariadb_responsive(host: str, port: int, user: str, password: str, dat
             resp = await cursor.fetchone()
         return resp[0] == 1
     finally:
-        await conn.close()
+        with contextlib.suppress(Exception):
+            await conn.close()
 
 
 @pytest.fixture()
@@ -63,6 +66,11 @@ def mariadb_password() -> str:
     return "super-secret"
 
 
+@pytest.fixture()
+def mariadb_root_password() -> str:
+    return "super-secret"
+
+
 @pytest.fixture()
 def mariadb_database() -> str:
     return "db"
@@ -90,9 +98,15 @@ async def mariadb113_service(
     mariadb_database: str,
     mariadb_user: str,
     mariadb_password: str,
+    mariadb_root_password: str,
 ) -> None:
+    os.environ["MARIADB_ROOT_PASSWORD"] = mariadb_root_password
+    os.environ["MARIADB_PASSWORD"] = mariadb_password
+    os.environ["MARIADB_USER"] = mariadb_user
+    os.environ["MARIADB_DATABASE"] = mariadb_database
+    os.environ["MARIADB113_PORT"] = str(mariadb113_port)
     await docker_services.start(
-        "mariadb8",
+        "mariadb113",
         timeout=45,
         pause=1,
         check=mariadb_responsive,
@@ -111,7 +125,13 @@ async def mariadb_service(
     mariadb_database: str,
     mariadb_user: str,
     mariadb_password: str,
+    mariadb_root_password: str,
 ) -> None:
+    os.environ["MARIADB_ROOT_PASSWORD"] = mariadb_root_password
+    os.environ["MARIADB_PASSWORD"] = mariadb_password
+    os.environ["MARIADB_USER"] = mariadb_user
+    os.environ["MARIADB_DATABASE"] = mariadb_database
+    os.environ[f"{mariadb_default_version.upper()}_PORT"] = str(mariadb_port)
     await docker_services.start(
         mariadb_default_version,
         timeout=45,