Open source video conferencing app powered by LiveKit. Built with Django and React.
🔧(dev) use a dedicated folder for docker compose overrides
briquet78960d976978
diff --git a/devenv.nix b/devenv.nixindex bd3d850d..e87f2bdc 100644--- a/devenv.nix+++ b/devenv.nix@@ -219,13 +219,14 @@ inesac# Compose files to merge+ _compose_dir="${config.devenv.root}/docker/compose.d"_compose_files="${config.devenv.root}/compose.yml"export DOCKER_USER="$(id -u):$(id -g)"case "''${DOCKER_HOST:-}" in*podman*)- _compose_files="$_compose_files:${config.devenv.root}/compose.podman.yml"+ _compose_files="$_compose_files:$_compose_dir/compose.podman.yml"# Build images with Podman/Buildah rather than BuildKit. `docker# compose build` otherwise has buildx boot a moby/buildkit container,@@ -242,10 +243,10 @@ in# Apply Bureautix override- _compose_files="$_compose_files:${config.devenv.root}/compose.bureautix.yml"+ _compose_files="$_compose_files:$_compose_dir/compose.bureautix.yml"export COMPOSE_FILE="$_compose_files"- unset _compose_files+ unset _compose_dir _compose_files# Make binaries accessiblefor _d in \diff --git a/compose.bureautix.yml b/docker/compose.d/compose.bureautix.ymlsimilarity index 100%rename from compose.bureautix.ymlrename to docker/compose.d/compose.bureautix.ymldiff --git a/compose.podman.yml b/docker/compose.d/compose.podman.ymlsimilarity index 100%rename from compose.podman.ymlrename to docker/compose.d/compose.podman.yml