From b685ff786777c05848f07c4c4d4c35bcf753c5be Mon Sep 17 00:00:00 2001
From: George Poulios <gpoulios@census-labs.com>
Date: Tue, 31 Oct 2023 15:30:35 +0200
Subject: [PATCH] Add '-o' option to groupadd in Dockerfile.build_env

Under OSX, user group (staff) is in the low tens (20)
and conflicts with system groups of Ubuntu. '-o' allows
to create group with same GID but different name.
---
 packaging/Dockerfile.build_env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/Dockerfile.build_env b/packaging/Dockerfile.build_env
index fdccbe639e29..824a40ff72e5 100644
--- a/packaging/Dockerfile.build_env
+++ b/packaging/Dockerfile.build_env
@@ -4,7 +4,7 @@ FROM ghcr.io/tiiuae/px4-firmware-builder-base:latest
 ARG UID=1000
 ARG GID=1000
 
-RUN groupadd -g $GID builder && \
+RUN groupadd -o -g $GID builder && \
     useradd -m -u $UID -g $GID -g builder builder && \
     usermod -aG sudo builder && \
     echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers