Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/build-aci: support BINARYDIR and BUILDDIR

Browse Source 
This makes it more configurable, and is ready for overall release script.
This commit is contained in:
Yicheng Qin 2015-09-06 00:05:07 -07:00
parent 6b70fa72fe
commit 15d1db9bf8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/build-aci
View File

@ -1,10 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
BINARYDIR=${BINARYDIR:-bin}
BUILDDIR=${BUILDDIR:-bin}
# A non-installed actool can be used, for example: # A non-installed actool can be used, for example:
# ACTOOL=../../appc/spec/bin/actool # ACTOOL=../../appc/spec/bin/actool
ACTOOL=${ACTOOL:-actool} ACTOOL=${ACTOOL:-actool}
IMAGEDIR=${IMAGEDIR:-bin/image-aci} IMAGEDIR=${IMAGEDIR:-$BUILDDIR/image-aci}
VERSION=$1 VERSION=$1
@ -13,8 +16,8 @@ if ! command -v $ACTOOL >/dev/null; then
exit 1 exit 1
fi fi
if [ ! -x bin/etcd ] ; then if [ ! -x $BINARYDIR/etcd ] ; then
echo "bin/etcd not found. Is it compiled?" echo "$BINARYDIR/etcd not found. Is it compiled?"
exit 1 exit 1
fi fi
@ -34,7 +37,7 @@ if [ -n "$(ls -A $IMAGEDIR/rootfs)" ]; then
exit 1 exit 1
fi fi
cp bin/etcd bin/etcdctl $IMAGEDIR/rootfs/ cp $BINARYDIR/etcd $BINARYDIR/etcdctl $IMAGEDIR/rootfs/
cp README.md $IMAGEDIR/rootfs/ cp README.md $IMAGEDIR/rootfs/
cp etcdctl/README.md $IMAGEDIR/rootfs/README-etcdctl.md cp etcdctl/README.md $IMAGEDIR/rootfs/README-etcdctl.md
cp -r Documentation $IMAGEDIR/rootfs/ cp -r Documentation $IMAGEDIR/rootfs/
@ -98,4 +101,4 @@ cat <<DF > $IMAGEDIR/rootfs/etc/hosts
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
DF DF
$ACTOOL build -overwrite=true $IMAGEDIR bin/etcd-${1}-linux-amd64.aci $ACTOOL build -overwrite=true $IMAGEDIR $BUILDDIR/etcd-${1}-linux-amd64.aci