travis: fix issue with FS priviliges after recent update

.travis.yml

@@ -4,6 +4,6 @@ install:
   - sudo .travis/setup-alpine
 script: |
   source .travis/common.sh
-  alpine_run $ALPINE_USER .travis/build-pkgs
+  alpine_run $USER .travis/build-pkgs
 notifications:
   email: false

.travis/common.sh

@@ -1,7 +1,6 @@
 # vim: set ts=4:
 
 readonly ALPINE_ROOT='/mnt/alpine'
-readonly ALPINE_USER='alpine'
 readonly CLONE_DIR="${CLONE_DIR:-$(pwd)}"
 readonly MIRROR_URI='http://nl.alpinelinux.org/alpine/edge'
 

.travis/setup-alpine

@@ -12,9 +12,9 @@ mount --bind "$CLONE_DIR" "${ALPINE_ROOT}${CLONE_DIR}"
 alpine_run <<-EOF
 	apk add alpine-sdk lua-aports
 
-	adduser -G users -s /bin/sh -D $ALPINE_USER
-	addgroup $ALPINE_USER abuild
-	addgroup $ALPINE_USER wheel
+	adduser -u $SUDO_UID -G users -s /bin/sh -D $SUDO_USER
+	addgroup $SUDO_USER abuild
+	addgroup $SUDO_USER wheel
 
 	echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel
 
@@ -28,6 +28,6 @@ alpine_run <<-EOF
 EOF
 
 # This key will not be used anywhere, just to make abuild happy...
-alpine_run $ALPINE_USER <<-EOF
+alpine_run $SUDO_USER <<-EOF
 	abuild-keygen -ain
 EOF