travis: replace custom scripts with alpine-chroot-install

11 files changed, 16 insertions, 169 deletions

diff --git a/.travis.yml b/.travis.yml
index 46ae581..e132646 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,20 @@
 sudo: required
+dist: trusty
+language: minimal
+
+before_install:
+  - "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.5.0/alpine-chroot-install' \
+        && echo '1866bc078cab859cefcbdbbd2dee0141e0bee8d5  alpine-chroot-install' | sha1sum -c || exit 1"
+  - alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
 install:
-  - sudo .travis/install-alpine
-  - sudo .travis/setup-alpine
-  - sudo .travis/install-deps
-script: |
-  source .travis/common.sh
-  alpine_run $ALPINE_USER './test.sh -x -y'
-  alpine_run $ALPINE_USER './test.sh -x -y header'
+  - sudo sh alpine-chroot-install
+        -p 'build-base linux-headers util-linux-dev kmod-dev cryptsetup-dev sudo'
+        -p 'cryptsetup e2fsprogs'
+before_script:
+  - /alpine/enter-chroot "addgroup $USER wheel"
+script:
+  - alpine './test.sh -x -y'
+  - alpine './test.sh -x -y header'
+
 notifications:
   email: false
diff --git a/.travis/common.sh b/.travis/common.sh
deleted file mode 100644
index f91e024..0000000
--- a/.travis/common.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# vim: set ts=4:
-
-readonly ALPINE_ROOT='/mnt/alpine'
-readonly ALPINE_USER='alpine'
-readonly CLONE_DIR="${CLONE_DIR:-$(pwd)}"
-
-# Runs commands inside the Alpine chroot.
-alpine_run() {
-	local user="${1:-root}"
-	local cmd="${2:-sh}"
-
-	local _sudo=
-	[ "$(id -u)" -eq 0 ] || _sudo='sudo'
-
-	$_sudo chroot "$ALPINE_ROOT" /usr/bin/env -i su -l $user \
-		sh -c "cd $CLONE_DIR; $cmd"
-}
-
-die() {
-	print -s1 -c1 "$@\n" 1>&2
-	exit 1
-}
-
-# Prints formatted and colored text.
-print() {
-	local style=0
-	local fcolor=9
-
-	local opt; while getopts 's:c:' opt; do
-		case "$opt" in
-			s) style="$OPTARG";;
-			c) fcolor="$OPTARG";;
-		esac
-	done
-
-	shift $(( OPTIND - 1 ))
-	local text="$@"
-
-	printf "\033[${style};3${fcolor}m$text\033[0m"
-}
-
-title() {
-	printf '\n'
-	print -s1 -c6 "==> $@\n"
-}
diff --git a/.travis/install-alpine b/.travis/install-alpine
deleted file mode 100755
index 756bbd8..0000000
--- a/.travis/install-alpine
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# vim: set ts=4:
-set -eu
-
-. "$(dirname "$0")"/common.sh
-
-APK_TOOLS_URI='http://dl-cdn.alpinelinux.org/alpine/v3.4/main/x86_64/apk-tools-static-2.6.7-r0.apk'
-APK_TOOLS_SHA256='342458308b8ebdb6a91d347b6b2cced7349c0cd0560a7fd7cdd71c5e1aa2b9f3'
-
-
-title 'Downloading apk-tools-static'
-
-cd /tmp
-wget "$APK_TOOLS_URI"
-echo "$APK_TOOLS_SHA256  $(basename "$APK_TOOLS_URI")" | sha256sum -c
-tar -xzf $(basename "$APK_TOOLS_URI")
-
-
-title 'Installing Alpine Linux'
-
-mkdir -p "$ALPINE_ROOT"/etc/apk
-cd "$ALPINE_ROOT"
-
-cp -R "$CLONE_DIR"/.travis/keys etc/apk/keys
-cp "$CLONE_DIR"/.travis/repositories etc/apk/repositories
-cp /etc/resolv.conf etc/resolv.conf
-
-/tmp/sbin/apk.static \
-	--root . --update-cache --initdb --no-progress \
-	add alpine-base
-
-mount -t proc none proc
-mount --rbind /sys sys
-mount --rbind /dev dev
diff --git a/.travis/install-deps b/.travis/install-deps
deleted file mode 100755
index d2282bf..0000000
--- a/.travis/install-deps
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# vim: set ts=4:
-set -eu
-
-. "$(dirname "$0")"/common.sh
-
-title 'Installing dependencies'
-
-# Build dependencies
-alpine_run <<-EOF
-	apk add linux-headers util-linux-dev kmod-dev cryptsetup-dev
-EOF
-
-# Runtime dependencies
-alpine_run <<-EOF
-	apk add cryptsetup e2fsprogs
-EOF
diff --git a/.travis/keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub b/.travis/keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
deleted file mode 100644
index bb4bdc8..0000000
--- a/.travis/keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe
-qxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O
-Q0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA
-jixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R
-L5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo
-GuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B
-ywIDAQAB
------END PUBLIC KEY-----
diff --git a/.travis/keys/alpine-devel@lists.alpinelinux.org-4d07755e.rsa.pub b/.travis/keys/alpine-devel@lists.alpinelinux.org-4d07755e.rsa.pub
deleted file mode 100644
index 6b5b860..0000000
--- a/.travis/keys/alpine-devel@lists.alpinelinux.org-4d07755e.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqy4H+5jKkBM+3pELVDBF
-VclECAxk9dy23mNhbfxH6GfBUtVaJVpYOF943JR2LNfD88DJR5EXnKPxQYZN1PWZ
-MDoJbUil7GPOMHAm5AHtXYJhYeOF+rSyv4y6H1lgYQVDzA9z+4GATMBhqJ8oRrCy
-lAJ/vksY9PFkuK8oyygTxpc7ICpUMMLwIMwLMdVR4API2kaLfg9TlMpVGmQhOCRZ
-VygfN4H89n9ekPpSA0DHLSkKkRLzBlhtfw+Ho2fcw9BCU0Uj10pK6q0V+m2+r8aE
-07LZKH9NnddMaEJ+I58FwmxJRzt4+gKpiPhV4OHXLoJsXMLYhjV8kM/qbgASfW71
-jQIDAQAB
------END PUBLIC KEY-----
diff --git a/.travis/keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub b/.travis/keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
deleted file mode 100644
index 6cbfad7..0000000
--- a/.travis/keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+
-mTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy
-DO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K
-aA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G
-mnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0
-sS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg
-cQIDAQAB
------END PUBLIC KEY-----
diff --git a/.travis/keys/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub b/.travis/keys/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
deleted file mode 100644
index 1d34c93..0000000
--- a/.travis/keys/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr8s1q88XpuJWLCZALdKj
-lN8wg2ePB2T9aIcaxryYE/Jkmtu+ZQ5zKq6BT3y/udt5jAsMrhHTwroOjIsF9DeG
-e8Y3vjz+Hh4L8a7hZDaw8jy3CPag47L7nsZFwQOIo2Cl1SnzUc6/owoyjRU7ab0p
-iWG5HK8IfiybRbZxnEbNAfT4R53hyI6z5FhyXGS2Ld8zCoU/R4E1P0CUuXKEN4p0
-64dyeUoOLXEWHjgKiU1mElIQj3k/IF02W89gDj285YgwqA49deLUM7QOd53QLnx+
-xrIrPv3A+eyXMFgexNwCKQU9ZdmWa00MjjHlegSGK8Y2NPnRoXhzqSP9T9i2HiXL
-VQIDAQAB
------END PUBLIC KEY-----
diff --git a/.travis/keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub b/.travis/keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
deleted file mode 100644
index 83f0658..0000000
--- a/.travis/keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0
-cGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX
-yHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j
-g01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB
-Ca1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY
-sWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw
-wwIDAQAB
------END PUBLIC KEY-----
diff --git a/.travis/repositories b/.travis/repositories
deleted file mode 100644
index 5596bbc..0000000
--- a/.travis/repositories
+++ /dev/null
@@ -1 +0,0 @@
-http://dl-cdn.alpinelinux.org/alpine/edge/main
diff --git a/.travis/setup-alpine b/.travis/setup-alpine
deleted file mode 100755
index f296041..0000000
--- a/.travis/setup-alpine
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# vim: set ts=4:
-set -eu
-
-. "$(dirname "$0")"/common.sh
-
-title 'Setting up Alpine Linux'
-
-mkdir -p "${ALPINE_ROOT}${CLONE_DIR}"
-mount --bind "$CLONE_DIR" "${ALPINE_ROOT}${CLONE_DIR}"
-
-alpine_run <<-EOF
-	apk add alpine-sdk
-
-	adduser -G users -s /bin/sh -D $ALPINE_USER
-	addgroup $ALPINE_USER abuild
-	addgroup $ALPINE_USER wheel
-
-	echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel
-EOF