Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix osx build and git user conflict #541

Merged
merged 2 commits into from
Nov 1, 2023
Merged

Fix osx build and git user conflict #541

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b685ff7
Add '-o' option to groupadd in Dockerfile.build_env
gpoulios Oct 31, 2023
647ee2f
Avoid fatal error due to git user mismatch
gpoulios Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packaging/Dockerfile.build_env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,3 +16,5 @@ USER builder

VOLUME /px4-firmware/sources
WORKDIR /px4-firmware/sources

RUN git config --global --add safe.directory /px4-firmware/sources
Loading