Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🔧(podman) make the dev stack work with rootless podman

briquet2970420b849f
diff --git a/Makefile b/Makefile
index e78bee76..aafc5d56 100644
--- a/Makefile
+++ b/Makefile
@@ -292,7 +292,7 @@ shell: ## connect to database shell
# -- Database
dbshell: ## connect to database shell
- docker compose exec app-dev python manage.py dbshell
+ @$(COMPOSE_EXEC_APP) python manage.py dbshell
.PHONY: dbshell
resetdb: FLUSH_ARGS ?=
diff --git a/bin/_config.sh b/bin/_config.sh
index 840ed5b5..f6107bda 100644
--- a/bin/_config.sh
+++ b/bin/_config.sh
@@ -5,7 +5,7 @@ set -eo pipefail
REPO_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd)"
UNSET_USER=0
-COMPOSE_FILE="${REPO_DIR}/compose.yml"
+export COMPOSE_FILE="${COMPOSE_FILE:-${REPO_DIR}/compose.yml}"
COMPOSE_PROJECT="meet"
@@ -42,7 +42,6 @@ function _docker_compose() {
echo "🐳(compose) project: '${COMPOSE_PROJECT}' file: '${COMPOSE_FILE}'"
docker compose \
-p "${COMPOSE_PROJECT}" \
- -f "${COMPOSE_FILE}" \
--project-directory "${REPO_DIR}" \
"$@"
}
diff --git a/compose.podman.yml b/compose.podman.yml
new file mode 100644
index 00000000..4c40b435
--- /dev/null
+++ b/compose.podman.yml
@@ -0,0 +1,33 @@
+# Rootless Podman override for compose.yml.
+#
+# Rootless Podman maps container UID 0 to the host user and every other
+# container UID to a subuid that owns nothing in the worktree. Meet compose.ymlruns
+# its containers as DOCKER_USER=$(id -u):$(id -g), which would land on such a
+# subuid and make every bind mount effectively read-only.
+#
+# `userns_mode: keep-id` maps the host user to the same UID and GID inside the
+# container instead, so DOCKER_USER keeps its Docker value and files written
+# through a bind mount are owned by the host user on both sides.
+#
+# Only the services that mount the worktree and run as DOCKER_USER are listed.
+
+x-keep-id: &keep-id
+ userns_mode: keep-id
+
+services:
+ app-dev:
+ <<: *keep-id
+ celery-dev:
+ <<: *keep-id
+ minio:
+ <<: *keep-id
+ node:
+ <<: *keep-id
+ crowdin:
+ <<: *keep-id
+ metadata-collector-dev:
+ <<: *keep-id
+ multi-user-transcriber-dev:
+ <<: *keep-id
+ app-summary-dev:
+ <<: *keep-id