Fix user/group

* It's needed for both docker environments * It's linux specific Signed-off-by: Ryan Friedman <[email protected]>
ArduPilot · Sep 14, 2024 · 1d63008 · 1d63008
1 parent 33c5dfa
commit 1d63008
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/common/source/docs/common-wiki-editing-setup.rst b/common/source/docs/common-wiki-editing-setup.rst
@@ -109,18 +109,30 @@ Setup with Docker
 
 #. Open a command prompt in the root of the ardupilot_wiki repo and build the docker container for the wiki:
 
-   .. code-block:: bash
+.. tabs::
 
-       cd ardupilot_wiki
-       docker build . -t ardupilot_wiki --build-arg USER_UID=$(id -u) --build-arg USER_GID=$(id -g)
+   .. group-tab:: Linux
+
+      .. code-block:: bash
+
+        cd ardupilot_wiki
+        docker build . -t ardupilot_wiki --build-arg USER_UID=$(id -u) --build-arg USER_GID=$(id -g)
+
+
+   .. group-tab:: Windows
+
+      .. code-block:: powershell
+
+        cd ardupilot_wiki
+        docker build . -t ardupilot_wiki
 
 This will build a docker image with all package setup to build the wiki and name it ``ardupilot_wiki``.
 
 #. Use the container to build the wiki with a shared volume to get the build result on your computer:
 
    .. code-block:: bash
 
-       docker run --rm -it -v "${PWD}:/ardupilot_wiki" -u "$(id -u):$(id -g)" ardupilot_wiki python3 update.py
+       docker run --rm -it -v "$(pwd):/ardupilot_wiki" -u "$(id -u):$(id -g)" ardupilot_wiki python3 update.py
 
 #. Alternately, use the bash utility script in the ``ardupilot_wiki`` root directory:
 

diff --git a/dev/source/docs/building-setup-linux.rst b/dev/source/docs/building-setup-linux.rst
@@ -185,7 +185,7 @@ How to Build the Docker Image
 Build the docker image and tag it with the name ardupilot:
 ::
 
-    docker build . -t ardupilot
+    docker build . -t ardupilot --build-arg USER_UID=$(id -u) --build-arg USER_GID=$(id -g)
 
 Run ArduPilot Container
 -----------------------
@@ -194,6 +194,6 @@ the Ardupilot source, and launches an interactive shell inside the container. Fr
 you can build Ardupilot:
 ::
 
-    docker run --rm -it -v `pwd`:/ardupilot ardupilot:latest bash
+    docker run --rm -it -v "$(pwd):/ardupilot" -u "$(id -u):$(id -g)" ardupilot:latest bash