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

Merge pull request #2075 from endocode/alban/build-aci

Browse Source 
scripts: update build-aci
This commit is contained in:
Jonathan Boulle 2015-01-15 09:57:06 -08:00
commit c4e4a9711f
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build
View File

@ -11,7 +11,8 @@ ln -s ${PWD} $GOPATH/src/${REPO_PATH}
eval $(go env) eval $(go env)
go build -o bin/etcd ${REPO_PATH} # Static compilation is useful when etcd is run in a container
CGO_ENABLED=0 go build -a -ldflags '-s' -o bin/etcd ${REPO_PATH}
CGO_ENABLED=0 go build -a -ldflags '-s' -o bin/etcdctl ${REPO_PATH}/etcdctl CGO_ENABLED=0 go build -a -ldflags '-s' -o bin/etcdctl ${REPO_PATH}/etcdctl
go build -o bin/etcd-migrate ${REPO_PATH}/tools/etcd-migrate go build -o bin/etcd-migrate ${REPO_PATH}/tools/etcd-migrate
go build -o bin/etcd-dump-logs ${REPO_PATH}/tools/etcd-dump-logs go build -o bin/etcd-dump-logs ${REPO_PATH}/tools/etcd-dump-logs

52
scripts/build-aci
View File

@ -1,11 +1,45 @@
#!/usr/bin/bash #!/bin/bash
if [ ! -d rootfs ]; then # A non-installed actool can be used, for example:
mkdir -p rootfs # ACTOOL=../../appc/spec/bin/actool
mv * rootfs ACTOOL=${ACTOOL:-actool}
IMAGEDIR=${IMAGEDIR:-bin/image-aci}
VERSION=$1
if [ ! -x "$ACTOOL" ] ; then
echo "actool ($ACTOOL) is not executable"
exit 1
fi fi
cat <<DF > manifest if [ ! -x bin/etcd ] ; then
echo "bin/etcd not found. Is it compiled?"
exit 1
fi
if [ -z "$VERSION" ] ; then
echo "Usage: scripts/build-aci VERSION"
exit 1
fi
mkdir -p $IMAGEDIR/rootfs
if [ ! -d $IMAGEDIR/rootfs -o ! -x $IMAGEDIR/rootfs ]; then
echo "$IMAGEDIR/rootfs is not a writeable directory"
exit 1
fi
if [ -n "$(ls -A $IMAGEDIR/rootfs)" ]; then
echo "$IMAGEDIR/rootfs is not empty"
exit 1
fi
cp bin/etcd bin/etcdctl $IMAGEDIR/rootfs/
cp README.md $IMAGEDIR/rootfs/
cp etcdctl/README.md $IMAGEDIR/rootfs/README-etcdctl.md
cp -r Documentation $IMAGEDIR/rootfs/
cat <<DF > $IMAGEDIR/manifest
{ {
"acVersion": "0.1.1", "acVersion": "0.1.1",
"acKind": "ImageManifest", "acKind": "ImageManifest",
@ -13,7 +47,7 @@ cat <<DF > manifest
"labels": [ "labels": [
{"name": "os", "value": "linux"}, {"name": "os", "value": "linux"},
{"name": "arch", "value": "amd64"}, {"name": "arch", "value": "amd64"},
{"name": "version", "value": "${1}"} {"name": "version", "value": "${VERSION}"}
], ],
"app": { "app": {
"exec": [ "exec": [
@ -25,9 +59,9 @@ cat <<DF > manifest
} }
DF DF
mkdir -p rootfs/etc/ mkdir -p $IMAGEDIR/rootfs/etc/
cat <<DF > rootfs/etc/hosts 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 . ../etcd-${1}-linux-amd64.aci $ACTOOL build -overwrite=true $IMAGEDIR bin/etcd-${1}-linux-amd64.aci