aboutsummaryrefslogtreecommitdiffstats
path: root/.travis
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-07-19 22:10:11 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-07-19 22:11:20 +0200
commit705d03e2e0899d7fc6fa09bb503daa561d423432 (patch)
tree3e1d52937fc860f3ff298429c61c714af2adfd93 /.travis
parentae11ee328c2d7ab250ccebff866c8c120c14775a (diff)
downloadaports-705d03e2e0899d7fc6fa09bb503daa561d423432.tar.gz
aports-705d03e2e0899d7fc6fa09bb503daa561d423432.tar.bz2
aports-705d03e2e0899d7fc6fa09bb503daa561d423432.tar.xz
travis: fix issue with FS priviliges after recent update
Diffstat (limited to '.travis')
-rw-r--r--.travis/common.sh1
-rwxr-xr-x.travis/setup-alpine8
2 files changed, 4 insertions, 5 deletions
diff --git a/.travis/common.sh b/.travis/common.sh
index 8b8cecdcbb..badb440e40 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 a922dff671..cb20867edf 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