Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build-aci: Fix ACI image name #8090

Merged
merged 1 commit into from
Jun 14, 2017
Merged

build-aci: Fix ACI image name #8090

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions scripts/build-aci
View file
Open in desktop
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