Merge pull request containers#15574 from edsantiago/fix_useradd_flake

Cirrus: pick UIDs/GIDs starting at 1500, not 1000
cdoern · Sep 1, 2022 · 3994eb6 · 3994eb6
2 parents 72f4c77 + 5faf4ef
commit 3994eb6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
@@ -158,9 +158,9 @@ setup_rootless() {
     msg "************************************************************"
     cd $GOSRC || exit 1
     # Guarantee independence from specific values
-    rootless_uid=$[RANDOM+1000]
+    rootless_uid=$((1500 + RANDOM % 5000))
     ROOTLESS_UID=$rootless_uid
-    rootless_gid=$[RANDOM+1000]
+    rootless_gid=$((1500 + RANDOM % 5000))
     msg "creating $rootless_uid:$rootless_gid $ROOTLESS_USER user"
     groupadd -g $rootless_gid $ROOTLESS_USER
     useradd -g $rootless_gid -u $rootless_uid --no-user-group --create-home $ROOTLESS_USER