Packaging now builds musl version for Docker

package.sh

@@ -6,24 +6,44 @@
 #
 #   curl https://api.github.com/repos/rqlite/rqlite/releases
 #
+# To install musl tools run:
+#
+#     sudo apt-get -y install musl-dev musl-tools
+
+# copy_binaries <dst_path> <src_dir>
+copy_binaries () {
+	cp $2/rqlited $1
+	cp $2/rqlite $1
+	cp $2/rqbench $1
+}
+
+# upload_asset <path> <release ID> <API token>
+upload_asset () {
+	release_pkg_name=`basename $1`
+	upload_url="https://uploads.github.com/repos/rqlite/rqlite/releases/$2/assets"
+	curl -v -H "Content-type: application/octet-stream" -H "Authorization: token $3" -XPOST $upload_url?name=$release_pkg_name --data-binary @$1
+}
+
+REPO_URL="https://github.com/rqlite/rqlite"
 
 if [ $# -lt 1 ]; then
     echo "$0 <version> [release_id api_token]"
     exit 1
 fi
 
-REPO_URL="https://github.com/rqlite/rqlite"
-
 VERSION=$1
 RELEASE_ID=$2
 API_TOKEN=$3
 
+# Create work directories
 tmp_build=`mktemp -d`
 tmp_pkg=`mktemp -d`
-
+tmp_musl_pkg=`mktemp -d`
 echo "$tmp_build created for build process."
 echo "$tmp_pkg created for packaging process."
+echo "$tmp_musl_pkg created for musl packaging process."
 
+# Get common build parameters
 kernel=`uname -s`
 machine=`uname -m`
 if [ "$machine" == "x86_64" ]; then
@@ -34,39 +54,63 @@ commit=`git rev-parse HEAD`
 kernel=`uname -s`
 buildtime=`date +%Y-%m-%dT%T%z`
 
+# Prepare common linker flags
+LINKER_PKG_PATH=github.com/rqlite/rqlite/cmd
+LDFLAGS="-X $LINKER_PKG_PATH.Version=$VERSION -X $LINKER_PKG_PATH.Branch=$branch -X $LINKER_PKG_PATH.Commit=$commit -X $LINKER_PKG_PATH.Buildtime=$buildtime"
+
+# Prepare the source code
 mkdir -p $tmp_build/src/github.com/rqlite
 export GOPATH=$tmp_build
 cd $tmp_build/src/github.com/rqlite
 git clone $REPO_URL
 cd rqlite
 go get -d ./...
 
-LINKER_PKG_PATH=github.com/rqlite/rqlite/cmd
-if [ `uname` = "Linux" ]; then
+# Build vanilla release
+rm -f $GOPATH/bin/*
+if [ "$kernel" = "Linux" ]; then
 	STATIC="-extldflags=-static"
 fi
-go install -tags osusergo,netgo,sqlite_omit_load_extension -ldflags="$STATIC -X $LINKER_PKG_PATH.Version=$VERSION -X $LINKER_PKG_PATH.Branch=$branch -X $LINKER_PKG_PATH.Commit=$commit -X $LINKER_PKG_PATH.Buildtime=$buildtime" ./...
-
-if [ `uname` = "Linux" ]; then
-	ldd $GOPATH/bin/rqlited
+CGO_ENABLED=1 go install -a -tags osusergo,netgo,sqlite_omit_load_extension -ldflags="$STATIC $LDFLAGS" ./...
+if [ "$kernel" = "Linux" ]; then
+	ldd $GOPATH/bin/rqlited 2>&1 >/dev/null
 	if [ $? -ne 1 ]; then
 		echo "Failed to confirm fully static linking on Linux"
 		exit 1
 	fi
 fi
 
+# Package the vanilla release
 release=`echo rqlite-$VERSION-$kernel-$machine | tr '[:upper:]' '[:lower:]'`
-release_pkg=${release}.tar.gz
+tarball=${release}.tar.gz
 mkdir $tmp_pkg/$release
-cp $GOPATH/bin/rqlited $tmp_pkg/$release
-cp $GOPATH/bin/rqlite $tmp_pkg/$release
-cp $GOPATH/bin/rqbench $tmp_pkg/$release
-cd $tmp_pkg
-tar cvfz $release_pkg $release
-
-if [ -z "$API_TOKEN" ]; then
-    exit 0
+copy_binaries $tmp_pkg/$release $GOPATH/bin
+( cd $tmp_pkg/; tar cvfz $tarball $release )
+
+# Upload if passed an API token
+if [ -n "$API_TOKEN" ]; then
+    upload_asset $tmp_pkg/$tarball $RELEASE_ID $API_TOKEN
+fi
+
+if [ "$kernel" != "Linux" ]; then
+	# We're done
+	exit 0
+fi
+
+# Build version for Docker use
+rm -f $GOPATH/bin/*
+cd $tmp_build/src/github.com/rqlite/rqlite
+CGO_ENABLED=1 CC=musl-gcc go install -a -tags sqlite_omit_load_extension -ldflags="$LDFLAGS" ./...
+
+# Package the musl release
+release=`echo rqlite-$VERSION-$kernel-$machine-musl | tr '[:upper:]' '[:lower:]'`
+tarball=${release}.tar.gz
+mkdir $tmp_musl_pkg/$release
+copy_binaries $tmp_musl_pkg/$release $GOPATH/bin
+( cd $tmp_musl_pkg; tar cvfz $tarball $release )
+
+# Upload if passed an API token
+if [ -n "$API_TOKEN" ]; then
+    upload_asset $tmp_musl_pkg/$tarball $RELEASE_ID $API_TOKEN
 fi
 
-upload_url="https://uploads.github.com/repos/rqlite/rqlite/releases/$RELEASE_ID/assets"
-curl -v -H "Content-type: application/octet-stream" -H "Authorization: token $API_TOKEN" -XPOST $upload_url?name=$release_pkg --data-binary @$release_pkg