Skip to content
/ etcd Public
forked from etcd-io/etcd

Commit

Permalink
Merge pull request etcd-io#8090 from glevand/for-merge-aci
Browse files Browse the repository at this point in the history
build-aci: Fix ACI image name
  • Loading branch information
gyuho authored Jun 14, 2017
2 parents 750dc7f + e402606 commit e6d2667
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions scripts/build-aci
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ fi
acbuild --debug begin

TMPHOSTS="$(mktemp)"
ACI_ARCH="$(go2aci ${GOARCH})"

acbuildEnd() {
rm "$TMPHOSTS"
Expand Down Expand Up @@ -71,7 +72,7 @@ acbuild --debug port add peer tcp 2380

acbuild --debug copy "$TMPHOSTS" /etc/hosts

acbuild --debug label add arch "$(go2aci ${GOARCH})"
acbuild --debug label add arch "${ACI_ARCH}"

# mkdir default data-dir
mkdir -p .acbuild/currentaci/rootfs/var/lib/etcd
Expand All @@ -80,4 +81,4 @@ mkdir -p .acbuild/currentaci/rootfs/var/lib/etcd
ln -s ./usr/local/bin/etcd .acbuild/currentaci/rootfs/etcd
ln -s ./usr/local/bin/etcdctl .acbuild/currentaci/rootfs/etcdctl

acbuild --debug write --overwrite $BUILDDIR/etcd-${1}-linux-${GOARCH}.aci
acbuild --debug write --overwrite $BUILDDIR/etcd-${1}-linux-${ACI_ARCH}.aci

0 comments on commit e6d2667

Please sign in to comment.