diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | .travis/common.sh | 1 | ||||
| -rwxr-xr-x | .travis/setup-alpine | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index b3935f9fc70..dd81eb4b0ad 100644 --- a/.travis.yml +++ b/.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 diff --git a/.travis/common.sh b/.travis/common.sh index 8b8cecdcbbf..badb440e405 100644 --- a/.travis/common.sh +++ b/.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' diff --git a/.travis/setup-alpine b/.travis/setup-alpine index a922dff671f..cb20867edf7 100755 --- a/.travis/setup-alpine +++ b/.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 |