From 8be4a0e5a5129de0971b8fc5bd8f3d884ff06962 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Mon, 18 Mar 2024 15:19:53 +0000 Subject: [PATCH 1/2] docs: stabilize podman support for devel These instructions are quite outdated. Podman works flawlessly for development after its v4. --- docs/faq.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index 757a28a5..213fc38b 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -356,11 +356,7 @@ default. ## How to use with podman? -Podman 3.4+ support is experimental. - -⚠ You will not have [network isolation](daily-usage.md#network-isolation) until podman -rootless networks are fully supported. See -https://github.com/containers/podman/issues/10672 for progress on that subject. +Podman 4+ is supported for development, provided you follow these instructions. Example usage: @@ -375,11 +371,9 @@ systemctl enable --user --now podman.socket export DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock # Instruct git-aggregator to use inner UID and GID 0, which podman will map to your user export DOODBA_GITAGGREGATE_UID=0 DOODBA_GITAGGREGATE_GID=0 DOODBA_UMASK=22 -# Disable network isolation -export DOODBA_NETWORK_INTERNAL=false ``` -Once all that is done, continue with normal wokflow on that terminal. +Once all that is done, continue with normal workflow on that terminal. Add those exports to your bash profile to avoid repeating them for each terminal. If you use `fish`, it's easier: @@ -387,7 +381,6 @@ use `fish`, it's easier: ```fish # Fish-only syntax to save all those exports permanently set --universal --export DOCKER_HOST unix:///run/user/(id -u)/podman/podman.sock -set --universal --export DOODBA_NETWORK_INTERNAL false set --universal --export DOODBA_GITAGGREGATE_UID 0 set --universal --export DOODBA_GITAGGREGATE_GID 0 set --universal --export DOODBA_UMASK 22 From efd2a41d57e5046b5b968b1990fa327a74de95c7 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 19 Mar 2024 07:31:17 +0000 Subject: [PATCH 2/2] ci: don't attempt to install non-existing root package --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e131679..c6c3e2c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,7 +79,7 @@ jobs: - run: pip install poetry - name: Patch $PATH run: echo "$HOME/.local/bin" >> $GITHUB_PATH - - run: poetry install + - run: poetry install --no-root # Precreate shared networks to avoid race conditions - run: docker network create inverseproxy_shared - run: docker network create globalwhitelist_shared