-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Since "go test" doesn't seem to support "-installsuffix" as quite the same perfect solution that "go build" is happy to let it be, let's just switch those crappy old "integration/" tests to use our separate static dockerinit binary so we don't have to worry about compiling the entire test harness statically. 👍 Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
- Loading branch information
Showing
8 changed files
with
46 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
# dockerinit still needs to be a static binary, even if docker is dynamic | ||
go build \ | ||
-o "$DEST/dockerinit-$VERSION" \ | ||
"${BUILDFLAGS[@]}" \ | ||
-ldflags " | ||
$LDFLAGS | ||
$LDFLAGS_STATIC | ||
-extldflags \"$EXTLDFLAGS_STATIC\" | ||
" \ | ||
./dockerinit | ||
echo "Created binary: $DEST/dockerinit-$VERSION" | ||
ln -sf "dockerinit-$VERSION" "$DEST/dockerinit" | ||
|
||
sha1sum= | ||
if command -v sha1sum &> /dev/null; then | ||
sha1sum=sha1sum | ||
elif command -v shasum &> /dev/null; then | ||
# Mac OS X - why couldn't they just use the same command name and be happy? | ||
sha1sum=shasum | ||
else | ||
echo >&2 'error: cannot find sha1sum command or equivalent' | ||
exit 1 | ||
fi | ||
|
||
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another | ||
export DOCKER_INITSHA1="$($sha1sum $DEST/dockerinit-$VERSION | cut -d' ' -f1)" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters