.gitattributes

@@ -0,0 +1,2 @@
+# Shell scripts
+*.sh text eol=lf

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "4.5.0"
+    ".": "4.5.1"
 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [4.5.1](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.5.0...testcontainers-v4.5.1) (2024-05-31)
+
+
+### Bug Fixes
+
+* **k3s:** add configuration parameter for disabling cgroup mount to avoid "unable to apply cgroup configuration" ([#592](https://github.com/testcontainers/testcontainers-python/issues/592)) ([8917772](https://github.com/testcontainers/testcontainers-python/commit/8917772d8c90d26086af3b9606657c95928e2b9d))
+* **keycloak:** realm import ([#584](https://github.com/testcontainers/testcontainers-python/issues/584)) ([111bd09](https://github.com/testcontainers/testcontainers-python/commit/111bd094428b83233d7eca693d94e10b34ee8ae8))
+
 ## [4.5.0](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.4.1...testcontainers-v4.5.0) (2024-05-25)
 
 

core/tests/test_registry.py

@@ -0,0 +1,83 @@
+"""Integration test using login to a private registry.
+
+Note: Using the testcontainers-python library to test the Docker registry.
+This could be considered a bad practice as it is not recommended to use the same library to test itself.
+However, it is a very good use case for DockerRegistryContainer and allows us to test it thoroughly.
+"""
+
+import json
+import os
+import base64
+import pytest
+
+from docker.errors import NotFound
+
+from testcontainers.core.config import testcontainers_config
+from testcontainers.core.container import DockerContainer
+from testcontainers.core.docker_client import DockerClient
+from testcontainers.core.waiting_utils import wait_container_is_ready
+
+from testcontainers.registry import DockerRegistryContainer
+
+
+def test_missing_on_private_registry(monkeypatch):
+    username = "user"
+    password = "pass"
+    image = "hello-world"
+    tag = "test"
+
+    with DockerRegistryContainer(username=username, password=password) as registry:
+        registry_url = registry.get_registry()
+
+        # prepare auth config
+        creds: bytes = base64.b64encode(f"{username}:{password}".encode("utf-8"))
+        config = {"auths": {f"{registry_url}": {"auth": creds.decode("utf-8")}}}
+        monkeypatch.setattr(testcontainers_config, name="docker_auth_config", value=json.dumps(config))
+        assert testcontainers_config.docker_auth_config, "docker_auth_config not set"
+
+        with pytest.raises(NotFound):
+            # Test a container with image from private registry
+            with DockerContainer(f"{registry_url}/{image}:{tag}") as test_container:
+                wait_container_is_ready(test_container)
+
+
+@pytest.mark.parametrize(
+    "image,tag,username,password",
+    [
+        ("nginx", "test", "user", "pass"),
+        ("hello-world", "latest", "new_user", "new_pass"),
+        ("alpine", "3.12", None, None),
+    ],
+)
+def test_with_private_registry(image, tag, username, password, monkeypatch):
+    client = DockerClient().client
+
+    with DockerRegistryContainer(username=username, password=password) as registry:
+        registry_url = registry.get_registry()
+
+        # prepare image
+        _image = client.images.pull(image)
+        assert _image.tag(repository=f"{registry_url}/{image}", tag=tag), "Image not tagged"
+
+        # login to private registry
+        client.login(registry=registry_url, username=username, password=password)
+
+        # push image to private registry
+        client.images.push(f"{registry_url}/{image}")
+
+        # clear local image so we will pull from private registry
+        client.images.remove(f"{registry_url}/{image}:{tag}")
+
+        # prepare auth config
+        creds: bytes = base64.b64encode(f"{username}:{password}".encode("utf-8"))
+        config = {"auths": {f"{registry_url}": {"auth": creds.decode("utf-8")}}}
+        monkeypatch.setattr(testcontainers_config, name="docker_auth_config", value=json.dumps(config))
+        assert testcontainers_config.docker_auth_config, "docker_auth_config not set"
+
+        # Test a container with image from private registry
+        with DockerContainer(f"{registry_url}/{image}:{tag}") as test_container:
+            wait_container_is_ready(test_container)
+
+    # cleanup
+    client.images.remove(f"{registry_url}/{image}:{tag}")
+    client.close()

modules/k3s/testcontainers/k3s/__init__.py

@@ -11,6 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
+
 from testcontainers.core.config import testcontainers_config
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_for_logs
@@ -37,13 +39,16 @@ class K3SContainer(DockerContainer):
     KUBE_SECURE_PORT = 6443
     RANCHER_WEBHOOK_PORT = 8443
 
-    def __init__(self, image="rancher/k3s:latest", **kwargs) -> None:
+    def __init__(self, image="rancher/k3s:latest", enable_cgroup_mount=True, **kwargs) -> None:
         super().__init__(image, **kwargs)
         self.with_exposed_ports(self.KUBE_SECURE_PORT, self.RANCHER_WEBHOOK_PORT)
         self.with_env("K3S_URL", f"https://{self.get_container_host_ip()}:{self.KUBE_SECURE_PORT}")
         self.with_command("server --disable traefik --tls-san=" + self.get_container_host_ip())
         self.with_kwargs(privileged=True, tmpfs={"/run": "", "/var/run": ""})
-        self.with_volume_mapping("/sys/fs/cgroup", "/sys/fs/cgroup", "rw")
+        if enable_cgroup_mount:
+            self.with_volume_mapping("/sys/fs/cgroup", "/sys/fs/cgroup", "rw")
+        else:
+            logging.warning("'enable_cgroup_mount' is experimental, see testcontainers/testcontainers-python#591)")
 
     def _connect(self) -> None:
         wait_for_logs(self, predicate="Node controller sync successful", timeout=testcontainers_config.timeout)

modules/keycloak/testcontainers/keycloak/__init__.py

@@ -80,7 +80,6 @@ def _readiness_probe(self) -> None:
             wait_for_logs(self, "Added user .* to realm .*")
 
     def start(self) -> "KeycloakContainer":
-        self._configure()
         super().start()
         self._readiness_probe()
         return self

pyproject.toml

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