Merge branch 'main' into reusable_containers

Author: matthiasschaub

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "4.9.0"
+    ".": "4.9.1"
 }

.github/CONTRIBUTING.md

@@ -33,7 +33,7 @@ You need to have the following tools available to you:
 - Run `make install` to get `poetry` to install all dependencies and set up `pre-commit`
   - **Recommended**: Run `make` or `make help` to see other commands available to you.
 - After this, you should have a working virtual environment and proceed with writing code with your favourite IDE
-- **TIP**: You can run `make core/tests` or `make module/<my-module>/tests` to run the tests specifically for that to speed up feedback cycles
+- **TIP**: You can run `make core/tests` or `make modules/<my-module>/tests` to run the tests specifically for that to speed up feedback cycles
 - You can also run `make lint` to run the `pre-commit` for the entire codebase.
 
 

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [4.9.1](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.9.0...testcontainers-v4.9.1) (2025-01-21)
+
+
+### Bug Fixes
+
+* milvus healthcheck: use correct requests errors ([#759](https://github.com/testcontainers/testcontainers-python/issues/759)) ([78b137c](https://github.com/testcontainers/testcontainers-python/commit/78b137cfe53fc81eb8d5d858e98610fb6a8792ad))
+* **mysql:** add dialect parameter instead of hardcoded mysql dialect ([#739](https://github.com/testcontainers/testcontainers-python/issues/739)) ([8d77bd3](https://github.com/testcontainers/testcontainers-python/commit/8d77bd3541e1c5e73c7ed5d5bd3c0d7bb617f5c0))
+* **tests:** replace dind-test direct docker usage with sdk ([#750](https://github.com/testcontainers/testcontainers-python/issues/750)) ([ace2a7d](https://github.com/testcontainers/testcontainers-python/commit/ace2a7d143fb80576ddc0859a9106aa8652f2356))
+
 ## [4.9.0](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.8.2...testcontainers-v4.9.0) (2024-11-26)
 
 

core/testcontainers/core/labels.py

@@ -21,12 +21,15 @@ def create_labels(image: str, labels: Optional[dict[str, str]]) -> dict[str, str
             if k.startswith(TESTCONTAINERS_NAMESPACE):
                 raise ValueError("The org.testcontainers namespace is reserved for internal use")
 
-    labels[LABEL_LANG] = "python"
-    labels[LABEL_TESTCONTAINERS] = "true"
-    labels[LABEL_VERSION] = importlib.metadata.version("testcontainers")
+    tc_labels = {
+        **labels,
+        LABEL_LANG: "python",
+        LABEL_TESTCONTAINERS: "true",
+        LABEL_VERSION: importlib.metadata.version("testcontainers"),
+    }
 
     if image == c.ryuk_image:
-        return labels
+        return tc_labels
 
-    labels[LABEL_SESSION_ID] = SESSION_ID
-    return labels
+    tc_labels[LABEL_SESSION_ID] = SESSION_ID
+    return tc_labels

core/tests/test_labels.py

@@ -56,3 +56,10 @@ def test_session_are_module_import_scoped():
     assert LABEL_SESSION_ID in first_labels
     assert LABEL_SESSION_ID in second_labels
     assert first_labels[LABEL_SESSION_ID] == second_labels[LABEL_SESSION_ID]
+
+
+def test_create_no_side_effects():
+    input_labels = {"key": "value"}
+    expected_labels = input_labels.copy()
+    create_labels("not-ryuk", {"key": "value"})
+    assert input_labels == expected_labels, input_labels

modules/keycloak/testcontainers/keycloak/__init__.py

@@ -20,6 +20,10 @@
 from testcontainers.core.waiting_utils import wait_container_is_ready, wait_for_logs
 
 _DEFAULT_DEV_COMMAND = "start-dev"
+# Since Keycloak v26.0.0
+# See: https://www.keycloak.org/server/all-config#category-bootstrap_admin
+ADMIN_USERNAME_ENVIRONMENT_VARIABLE = "KC_BOOTSTRAP_ADMIN_USERNAME"
+ADMIN_PASSWORD_ENVIRONMENT_VARIABLE = "KC_BOOTSTRAP_ADMIN_PASSWORD"
 
 
 class KeycloakContainer(DockerContainer):
@@ -57,6 +61,9 @@ def __init__(
         self.cmd = cmd
 
     def _configure(self) -> None:
+        self.with_env(ADMIN_USERNAME_ENVIRONMENT_VARIABLE, self.username)
+        self.with_env(ADMIN_PASSWORD_ENVIRONMENT_VARIABLE, self.password)
+        # legacy env vars (<= 26.0.0)
         self.with_env("KEYCLOAK_ADMIN", self.username)
         self.with_env("KEYCLOAK_ADMIN_PASSWORD", self.password)
         # Enable health checks
@@ -89,7 +96,8 @@ def _readiness_probe(self) -> None:
             response = requests.get(f"{self.get_url()}/health/ready", timeout=1)
         response.raise_for_status()
         if _DEFAULT_DEV_COMMAND in self._command:
-            wait_for_logs(self, "Added user .* to realm .*")
+            wait_for_logs(self, "started in \\d+\\.\\d+s")
+            wait_for_logs(self, "Created temporary admin user|Added user '")
 
     def start(self) -> "KeycloakContainer":
         super().start()

modules/keycloak/tests/test_keycloak.py

@@ -2,7 +2,7 @@
 from testcontainers.keycloak import KeycloakContainer
 
 
-@pytest.mark.parametrize("image_version", ["25.0", "24.0.1", "18.0"])
+@pytest.mark.parametrize("image_version", ["26.0.0", "25.0", "24.0.1", "18.0"])
 def test_docker_run_keycloak(image_version: str):
     with KeycloakContainer(f"quay.io/keycloak/keycloak:{image_version}") as keycloak_admin:
         assert keycloak_admin.get_client().users_count() == 1

modules/milvus/testcontainers/milvus/__init__.py

@@ -69,7 +69,7 @@ def _get_healthcheck_url(self) -> str:
         port = self.get_exposed_port(self.healthcheck_port)
         return f"http://{ip}:{port}"
 
-    @wait_container_is_ready(requests.exceptions.HTTPError)
+    @wait_container_is_ready(requests.exceptions.HTTPError, requests.exceptions.ConnectionError)
     def _healthcheck(self) -> None:
         healthcheck_url = self._get_healthcheck_url()
         response = requests.get(f"{healthcheck_url}/healthz", timeout=1)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "testcontainers"
-version = "4.9.0"  # auto-incremented by release-please
+version = "4.9.1"  # auto-incremented by release-please
 description = "Python library for throwaway instances of anything that can run in a Docker container"
 authors = ["Sergey Pirogov <[email protected]>"]
 maintainers = [