clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 05:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add cleanup/refactor portion of #2010 for hack and Dockerfile updates

Browse Source
This commit is contained in:
Tianon Gravi
2013-09-30 13:57:30 -06:00
parent ff85031980
commit ccefe47897
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hack/make.sh
+3 -3
View File
@@ -25,9 +25,9 @@ set -e
# but really, they shouldn't. We want to be in a container!
RESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
grep -q "$RESOLVCONF" /proc/mounts || {
echo "# WARNING! I don't seem to be running in a docker container."
echo "# The result of this command might be an incorrect build, and will not be officially supported."
echo "# Try this: 'docker build -t docker . && docker run docker ./hack/make.sh'"
echo >&2 "# WARNING! I don't seem to be running in a docker container."
echo >&2 "# The result of this command might be an incorrect build, and will not be officially supported."
echo >&2 "# Try this: 'docker build -t docker . && docker run docker ./hack/make.sh'"
}
# List of bundles to create when no argument is passed
hack/make/binary
+3 -3
View File
@@ -2,6 +2,6 @@
DEST=$1
go build -o $DEST/docker-$VERSION -ldflags "$LDFLAGS" ./docker
echo "Created binary: $DEST/docker-$VERSION"
if go build -o $DEST/docker-$VERSION -ldflags "$LDFLAGS" ./docker; then
echo "Created binary: $DEST/docker-$VERSION"
fi