diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2017-07-19 22:10:11 +0200 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-07-19 22:11:20 +0200 |
commit | 705d03e2e0899d7fc6fa09bb503daa561d423432 (patch) | |
tree | 3e1d52937fc860f3ff298429c61c714af2adfd93 /.travis | |
parent | ae11ee328c2d7ab250ccebff866c8c120c14775a (diff) | |
download | alpine_aports-705d03e2e0899d7fc6fa09bb503daa561d423432.tar.bz2 alpine_aports-705d03e2e0899d7fc6fa09bb503daa561d423432.tar.xz alpine_aports-705d03e2e0899d7fc6fa09bb503daa561d423432.zip |
travis: fix issue with FS priviliges after recent update
Diffstat (limited to '.travis')
-rw-r--r-- | .travis/common.sh | 1 | ||||
-rwxr-xr-x | .travis/setup-alpine | 8 |
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 @@ | |||
1 | # vim: set ts=4: | 1 | # vim: set ts=4: |
2 | 2 | ||
3 | readonly ALPINE_ROOT='/mnt/alpine' | 3 | readonly ALPINE_ROOT='/mnt/alpine' |
4 | readonly ALPINE_USER='alpine' | ||
5 | readonly CLONE_DIR="${CLONE_DIR:-$(pwd)}" | 4 | readonly CLONE_DIR="${CLONE_DIR:-$(pwd)}" |
6 | readonly MIRROR_URI='http://nl.alpinelinux.org/alpine/edge' | 5 | readonly MIRROR_URI='http://nl.alpinelinux.org/alpine/edge' |
7 | 6 | ||
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}" | |||
12 | alpine_run <<-EOF | 12 | alpine_run <<-EOF |
13 | apk add alpine-sdk lua-aports | 13 | apk add alpine-sdk lua-aports |
14 | 14 | ||
15 | adduser -G users -s /bin/sh -D $ALPINE_USER | 15 | adduser -u $SUDO_UID -G users -s /bin/sh -D $SUDO_USER |
16 | addgroup $ALPINE_USER abuild | 16 | addgroup $SUDO_USER abuild |
17 | addgroup $ALPINE_USER wheel | 17 | addgroup $SUDO_USER wheel |
18 | 18 | ||
19 | echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel | 19 | echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel |
20 | 20 | ||
@@ -28,6 +28,6 @@ alpine_run <<-EOF | |||
28 | EOF | 28 | EOF |
29 | 29 | ||
30 | # This key will not be used anywhere, just to make abuild happy... | 30 | # This key will not be used anywhere, just to make abuild happy... |
31 | alpine_run $ALPINE_USER <<-EOF | 31 | alpine_run $SUDO_USER <<-EOF |
32 | abuild-keygen -ain | 32 | abuild-keygen -ain |
33 | EOF | 33 | EOF |