docker-devkit 0.4.1.dev124__py3-none-any.whl → 0.4.2.dev127__py3-none-any.whl

docker_devkit/down.py

@@ -10,12 +10,12 @@ from .context_sha import compute_service_shas
 from .documents import parse_bake
 from .lifecycle import (
     enforce_bake_declaration,
+    enumerate_profiles,
     expand_compose_files,
     load_lifecycle_config,
     resolve_lock,
     resolve_manifest,
 )
-from .modes import resolve_auth_mode
 
 ENV_FILE = Path(".env")
 
@@ -44,8 +44,6 @@ def down(
     if gpu == "auto":
         gpu = detect_gpu()
 
-    resolve_auth_mode(ENV_FILE)
-
     if manifest is not None:
         os.environ.update(compute_service_shas(root, parse_bake(manifest)))
 
@@ -55,15 +53,11 @@ def down(
         raise RuntimeError("No compose files declared; a builds-only repo has no stack to tear down")
 
     files_args = " ".join(f"-f {compose_file}" for compose_file in compose_files)
-    command = (
-        "docker compose "
-        f"{files_args} "
-        f"--project-directory {root} "
-        "--profile keycloak "  # Always include so any keycloak containers from a previous AUTH_MODE=keycloak run get torn down
-        "--env-file .env "
-        f"--env-file {lock_file} "
-        "down --remove-orphans"
-    )
+    # Every profile declared across the assembly, so teardown covers containers from a prior
+    # bring-up under a different COMPOSE_PROFILES selection
+    compose_prefix = f"docker compose {files_args} --project-directory {root} --env-file .env --env-file {lock_file}"
+    profile_flags = "".join(f"--profile {profile} " for profile in enumerate_profiles(compose_prefix))
+    command = f"{compose_prefix} {profile_flags}down --remove-orphans"
 
     if volumes:
         command += " -v"

docker_devkit/lifecycle.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 from pathlib import Path
 
+from bashrun.bash import bash_output
+
 from .config import LifecycleConfig, load_config
 from .detect_gpu import Gpu
 
@@ -48,3 +50,8 @@ def expand_compose_files(config: LifecycleConfig | None, gpu: Gpu, *, include_de
     if include_dev and config.dev_file is not None:
         files.append(Path(config.dev_file))
     return files
+
+
+def enumerate_profiles(compose_prefix: str) -> list[str]:
+    output = bash_output(f"{compose_prefix} config --profiles")
+    return [line.strip() for line in output.splitlines() if line.strip()]

docker_devkit/modes.py

@@ -1,31 +1,16 @@
 from os import environ
 from pathlib import Path
-from urllib.parse import urlparse
 
-VALID_AUTH_MODES = ("keycloak", "disabled")
-DEFAULT_AUTH_MODE = "keycloak"
 
-
-def resolve_auth_mode(env_file: Path) -> str:
+def resolve_compose_profiles(env_file: Path) -> list[str]:
     file_values = parse_env_file(env_file)
-    public_url = environ.get("PUBLIC_URL") or file_values.get("PUBLIC_URL")
-    auth_mode = environ.get("AUTH_MODE") or file_values.get("AUTH_MODE", DEFAULT_AUTH_MODE)
-
-    if not public_url:
-        raise RuntimeError("PUBLIC_URL is required; set it in .env")
-    if auth_mode not in VALID_AUTH_MODES:
-        raise RuntimeError(f"AUTH_MODE={auth_mode!r} is invalid; expected one of {list(VALID_AUTH_MODES)}")
-
-    scheme = urlparse(public_url).scheme
-    if scheme not in ("http", "https"):
-        raise RuntimeError(f"PUBLIC_URL={public_url!r} must use http:// or https://")
-    if scheme == "http" and auth_mode == "keycloak":
-        raise RuntimeError(
-            f"AUTH_MODE=keycloak with PUBLIC_URL={public_url!r} is rejected: OAuth credentials must "
-            f"not flow in cleartext. Use https:// (e.g. via ngrok), or set AUTH_MODE=disabled."
-        )
-
-    return auth_mode
+    raw_profiles = environ.get("COMPOSE_PROFILES") or file_values.get("COMPOSE_PROFILES", "")
+    profiles: list[str] = []
+    for entry in raw_profiles.split(","):
+        profile = entry.strip()
+        if profile and profile not in profiles:
+            profiles.append(profile)
+    return profiles
 
 
 def parse_env_file(path: Path) -> dict[str, str]:

docker_devkit/up.py

@@ -11,13 +11,14 @@ from .context_sha import compute_service_shas
 from .documents import parse_bake
 from .lifecycle import (
     enforce_bake_declaration,
+    enumerate_profiles,
     expand_compose_files,
     load_lifecycle_config,
     resolve_lock,
     resolve_manifest,
 )
 from .mirror import enforce_mirrored, load_mirror_config
-from .modes import parse_env_file, resolve_auth_mode
+from .modes import parse_env_file, resolve_compose_profiles
 
 ENV_FILE = Path(".env")
 
@@ -66,8 +67,6 @@ def up(
     if gpu == "auto":
         gpu = detect_gpu()
 
-    auth_mode = resolve_auth_mode(ENV_FILE)
-
     mirror_config = load_mirror_config(root)
     if mirror_config is not None:
         enforce_mirrored(parse_env_file(lock_file))
@@ -83,10 +82,20 @@ def up(
         raise RuntimeError("No compose files declared; a builds-only repo has no stack to bring up")
 
     files_args = " ".join(f"-f {compose_file}" for compose_file in compose_files)
-    profile_flag = "--profile keycloak " if auth_mode == "keycloak" else ""
-    compose_args = f"{files_args} {profile_flag}--project-directory {root} --env-file .env --env-file {lock_file}"
-
-    up_command = f"docker compose {compose_args} up"
+    # compose ignores COMPOSE_PROFILES whenever a --profile flag is present, so the selection is
+    # resolved here and forwarded as explicit flags
+    compose_prefix = f"docker compose {files_args} --project-directory {root} --env-file .env --env-file {lock_file}"
+    profiles = resolve_compose_profiles(ENV_FILE)
+    if profiles:
+        defined = enumerate_profiles(compose_prefix)
+        unknown = [profile for profile in profiles if profile not in defined]
+        if unknown:
+            raise RuntimeError(
+                f"COMPOSE_PROFILES selects unknown profile(s) {unknown}; "
+                f"profiles defined by the compose files: {defined}"
+            )
+    profile_flags = "".join(f"--profile {profile} " for profile in profiles)
+    up_command = f"{compose_prefix} {profile_flags}up"
     if not build:
         # tree-<sha> tags are content-addressed and may not be pushed, so pull only what is missing locally
         up_command += " --pull missing"

{docker_devkit-0.4.1.dev124.dist-info → docker_devkit-0.4.2.dev127.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: docker-devkit
-Version: 0.4.1.dev124
+Version: 0.4.2.dev127
 Summary: Docker-stack lifecycle commands (up/down/build) driven by a pyproject-declared compose assembly
 License-File: LICENSE
 License-File: NOTICE

{docker_devkit-0.4.1.dev124.dist-info → docker_devkit-0.4.2.dev127.dist-info}/RECORD

@@ -4,18 +4,18 @@ docker_devkit/config.py,sha256=UMAS6yF1E9PIbsRs2TVig9XwSNCvQe5w9eTLUHOPKq0,3112
 docker_devkit/context_sha.py,sha256=lhCxUcYM98xCdDum3hsFRFw5WYrjvZUSMbOu_7ZmQjE,3041
 docker_devkit/detect_gpu.py,sha256=C4e3vixvSSJS6xQiMVWp2IdWSAgMr551KrBTuIrkTk4,456
 docker_devkit/documents.py,sha256=c6jqbBNUKyJOltex-8u536_niWhEL7ScOab_MwZmM9k,2195
-docker_devkit/down.py,sha256=WDlq_RBpP84E1-5sp7MtKEhRB9wBOz8Ib59RoviZ8uQ,2179
+docker_devkit/down.py,sha256=c4TtiT5aqIgr4WpyBF4czeHjZ6LJADmu0MlSUwAoKY4,2244
 docker_devkit/image_refs.py,sha256=dyngpklq8mz4rGzb7gZGg3o3i9q5YO6_DRAC9fBNRfw,5148
-docker_devkit/lifecycle.py,sha256=_2ZTn2xpjhDFzdVacA2oog2CvsDujaoc8oqnRnpHtC8,1631
+docker_devkit/lifecycle.py,sha256=sN1wWo5H5wxFMoCI0htqh24tQfp29L1sMN1olPlrPlc,1867
 docker_devkit/matrix.py,sha256=6NyGL4Ol849dYlcMRzAL2yjFoN6sGkGwVaaxcDm3bG4,4530
 docker_devkit/mirror.py,sha256=AGL_oQUv68DKXjEFVdD-NQoLbC6w3DZJ7h-lzzvdKwM,2334
-docker_devkit/modes.py,sha256=Lwhblzu5Kn7qhfy_QMqE28XuflSIJtCRBYNX7Iq8Qfo,1510
+docker_devkit/modes.py,sha256=UBBDYTEbzFm42BRuPCXQtQrmKJPjX7VlMqPE_WZLu4k,825
 docker_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docker_devkit/score_generate.py,sha256=psbQm-MWf9A5YP0ov0rLPUiuVAQbUWn6yfUmB-CXurU,9434
-docker_devkit/up.py,sha256=9h5fNuEfUQbQozae8yrueiSfS_Be_ne0SuR1j6tadbU,3394
-docker_devkit-0.4.1.dev124.dist-info/METADATA,sha256=F_Alz_F3jvIanQMGTCIHfYyg0pRBYW2KnSXcpb9SpW0,540
-docker_devkit-0.4.1.dev124.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-docker_devkit-0.4.1.dev124.dist-info/entry_points.txt,sha256=6cAHqlMvuXI00uTJLf73MTqWnLd1-m5sDgJrSyHWv4U,244
-docker_devkit-0.4.1.dev124.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
-docker_devkit-0.4.1.dev124.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
-docker_devkit-0.4.1.dev124.dist-info/RECORD,,
+docker_devkit/up.py,sha256=pbpGf2iciL2f35zxFFe5ApZ1PfE5FQOxkPDjJ5cwFxU,3941
+docker_devkit-0.4.2.dev127.dist-info/METADATA,sha256=Sbogss1YPvfZtdIKLVcWDd1ygQ2OQXvyS5xciKQ0j00,540
+docker_devkit-0.4.2.dev127.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+docker_devkit-0.4.2.dev127.dist-info/entry_points.txt,sha256=6cAHqlMvuXI00uTJLf73MTqWnLd1-m5sDgJrSyHWv4U,244
+docker_devkit-0.4.2.dev127.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
+docker_devkit-0.4.2.dev127.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
+docker_devkit-0.4.2.dev127.dist-info/RECORD,,