Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
19bb4a15bb | |||
a721ce6bbf |
9
build
9
build
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -e
|
set -xe
|
||||||
|
|
||||||
ORG_PATH="github.com/appc"
|
ORG_PATH="github.com/appc"
|
||||||
REPO_PATH="${ORG_PATH}/cni"
|
REPO_PATH="${ORG_PATH}/cni"
|
||||||
@ -14,18 +14,17 @@ export GOBIN=${PWD}/bin
|
|||||||
export GOPATH=${PWD}/gopath
|
export GOPATH=${PWD}/gopath
|
||||||
|
|
||||||
echo "Building API"
|
echo "Building API"
|
||||||
go build ${REPO_PATH}/libcni
|
go build "$@" ${REPO_PATH}/libcni
|
||||||
|
|
||||||
echo "Building reference CLI"
|
echo "Building reference CLI"
|
||||||
go install ${REPO_PATH}/cnitool
|
go install "$@" ${REPO_PATH}/cnitool
|
||||||
|
|
||||||
echo "Building plugins"
|
echo "Building plugins"
|
||||||
|
|
||||||
PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/*"
|
PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/*"
|
||||||
for d in $PLUGINS; do
|
for d in $PLUGINS; do
|
||||||
if [ -d $d ]; then
|
if [ -d $d ]; then
|
||||||
plugin=$(basename $d)
|
plugin=$(basename $d)
|
||||||
echo " " $plugin
|
echo " " $plugin
|
||||||
go install ${REPO_PATH}/$d
|
go install "$@" ${REPO_PATH}/$d
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
32
build-static
32
build-static
@ -1,32 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -xe
|
|
||||||
|
|
||||||
ORG_PATH="github.com/appc"
|
|
||||||
REPO_PATH="${ORG_PATH}/cni"
|
|
||||||
|
|
||||||
if [ ! -h gopath/src/${REPO_PATH} ]; then
|
|
||||||
mkdir -p gopath/src/${ORG_PATH}
|
|
||||||
ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
|
|
||||||
fi
|
|
||||||
|
|
||||||
export GO15VENDOREXPERIMENT=1
|
|
||||||
export GOBIN=${PWD}/bin
|
|
||||||
export GOPATH=${PWD}/gopath
|
|
||||||
export CGO_ENABLED=0
|
|
||||||
|
|
||||||
echo "Building API"
|
|
||||||
go build ${REPO_PATH}/libcni
|
|
||||||
|
|
||||||
echo "Building reference CLI"
|
|
||||||
go install --ldflags '-extldflags "-static"' ${REPO_PATH}/cnitool
|
|
||||||
|
|
||||||
echo "Building plugins"
|
|
||||||
|
|
||||||
PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/*"
|
|
||||||
for d in $PLUGINS; do
|
|
||||||
if [ -d $d ]; then
|
|
||||||
plugin=$(basename $d)
|
|
||||||
echo " " $plugin
|
|
||||||
go install ${REPO_PATH}/$d
|
|
||||||
fi
|
|
||||||
done
|
|
@ -7,6 +7,7 @@ FEDORA_INSTALL="dnf install -y golang tar xz bzip2 gzip sudo iproute wget"
|
|||||||
FEDORA_IMAGE="docker://fedora:23"
|
FEDORA_IMAGE="docker://fedora:23"
|
||||||
ACBUILD_URL="https://github.com/appc/acbuild/releases/download/v0.2.2/acbuild.tar.gz"
|
ACBUILD_URL="https://github.com/appc/acbuild/releases/download/v0.2.2/acbuild.tar.gz"
|
||||||
ACBUILD="acbuild --debug"
|
ACBUILD="acbuild --debug"
|
||||||
|
BUILDFLAGS="-a --ldflags '-extldflags \"-static\"'"
|
||||||
|
|
||||||
TAG=$(git describe --exact-match --abbrev=0) || TAG=$(git describe)
|
TAG=$(git describe --exact-match --abbrev=0) || TAG=$(git describe)
|
||||||
RELEASE_DIR=release-${TAG}
|
RELEASE_DIR=release-${TAG}
|
||||||
@ -25,7 +26,7 @@ sudo -E rkt run \
|
|||||||
${FEDORA_IMAGE} \
|
${FEDORA_IMAGE} \
|
||||||
--exec /bin/bash \
|
--exec /bin/bash \
|
||||||
-- -xe -c "\
|
-- -xe -c "\
|
||||||
${FEDORA_INSTALL}; cd /opt/src; umask 0022; ./build-static; ./test || true; \
|
${FEDORA_INSTALL}; cd /opt/src; umask 0022; CGO_ENABLED=0 ./build ${BUILDFLAGS}; \
|
||||||
for format in txz tbz2 tgz; do \
|
for format in txz tbz2 tgz; do \
|
||||||
FILENAME=cni-${TAG}.\$format; \
|
FILENAME=cni-${TAG}.\$format; \
|
||||||
FILEPATH=${RELEASE_DIR}/\$FILENAME; \
|
FILEPATH=${RELEASE_DIR}/\$FILENAME; \
|
||||||
|
Reference in New Issue
Block a user