diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-01 13:51:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-01 13:51:15 +0200 |
commit | 3994eb6985fb3183a36bce9c7f9ce4f0d6f1c59f (patch) | |
tree | 174df962851778caa7d07206197710ae2ef8d4b9 | |
parent | 72f4c77139adf61bc39890e08ed9b86c365ae09b (diff) | |
parent | 5faf4eff10116df32ed5554bb230acb2e3b54c66 (diff) | |
download | podman-3994eb6985fb3183a36bce9c7f9ce4f0d6f1c59f.tar.gz podman-3994eb6985fb3183a36bce9c7f9ce4f0d6f1c59f.tar.bz2 podman-3994eb6985fb3183a36bce9c7f9ce4f0d6f1c59f.zip |
Merge pull request #15574 from edsantiago/fix_useradd_flake
Cirrus: pick UIDs/GIDs starting at 1500, not 1000
-rw-r--r-- | contrib/cirrus/lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index e7ea05867..b03a3da3e 100644 --- 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 |