Skip to content

Fix build #81

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

Closed
friism wants to merge 2 commits into from
Closed

Fix build #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
595dcd2
sh wont always have source
friism May 14, 2017
2ab09c7
set CGO
friism May 14, 2017
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
4 changes: 2 additions & 2 deletions scripts/build/binary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env sh

source ./scripts/build/ldflags
. ./scripts/build/ldflags

go build -o ./build/docker --ldflags "${LDFLAGS}" github.com/docker/cli/cmd/docker
CGO_ENABLED=0 go build -o ./build/docker --ldflags "${LDFLAGS}" github.com/docker/cli/cmd/docker
Copy link
Contributor

@dnephin dnephin May 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think CGO_ENABLED is already set in the Dockerfiles, no?

Copy link
Contributor Author

@friism friism May 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but these scripts are invoked from make outside the Dockerfiles too so builds not using Docker won't work without this setting.

Copy link
Contributor

@dnephin dnephin May 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, this is also fixed in #78

Copy link
Contributor Author

@friism friism May 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool @dnephin do you want me to remove that change from this pr?

4 changes: 2 additions & 2 deletions scripts/build/cross
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env sh

source ./scripts/build/ldflags
. ./scripts/build/ldflags

gox -output build/docker-{{.OS}}-{{.Arch}} \
CGO_ENABLED=0 gox -output build/docker-{{.OS}}-{{.Arch}} \
-osarch="linux/arm linux/amd64 darwin/amd64 windows/amd64" \
--ldflags "${LDFLAGS}" \
github.com/docker/cli/cmd/docker
2 changes: 1 addition & 1 deletion scripts/build/ldflags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

VERSION=${VERSION:-"unknown-version"}
GITCOMMIT=${GITCOMMIT:-$(git rev-parse --short HEAD 2> /dev/null || true)}
Expand Down