Skip to content

Commit

Permalink
Makefile.cli: deal with {g,u}id collision
Browse files Browse the repository at this point in the history
[ upstream commit c338a63 ]

CLI builds have been failing with:
> addgroup: gid '123' in use

Fix this by redoing the addgroup, adduser command without a specific
gid/uid.

Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
  • Loading branch information
kkourt committed Dec 9, 2022
1 parent f69446c commit 6d1c6e1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.cli
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ cli-release:
--workdir /tetragon \
--volume `pwd`:/tetragon docker.io/library/golang:1.19.0-alpine3.16 \
sh -c "apk add --no-cache make git && \
addgroup -g $(RELEASE_GID) release && \
adduser -u $(RELEASE_UID) -D -G release release && \
(addgroup -g $(RELEASE_GID) release || addgroup release )&& \
(adduser -u $(RELEASE_UID) -D -G release release || adduser -D -G release release )&& \
su release -c 'make cli-local-release VERSION=${VERSION}'"

cli-local-release: cli-clean
Expand Down

0 comments on commit 6d1c6e1

Please sign in to comment.