1 files changed, 5 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index ada94c8..8fdfd8a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -288,7 +288,11 @@ set -x
 
 # Create the build user, /build home directory. Make a password-less sudo'er.
 #
-adduser --home /build --gecos "" --disabled-password build
+# Note that we force UID/GID to specific numbers to make sure they are
+# consistent across builds.
+#
+addgroup --gid 2000 build
+adduser --uid 2000 --gid 2000 --home /build --gecos "" --disabled-password build
 echo "build ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/build
 chmod 0440 /etc/sudoers.d/build