Browse code

Export GOOS and GOARCH in subprocess for tgz

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Michael Crosby authored on 2016/03/23 06:12:29
Showing 4 changed files
... ...
@@ -302,10 +302,12 @@ copy_containerd() {
302 302
             cp /usr/local/bin/ctr "$dir/"
303 303
             cp /usr/local/bin/containerd "$dir/"
304 304
             cp /usr/local/bin/containerd-shim "$dir/"
305
-            hash_files "$dir/runc"
306
-            hash_files "$dir/ctr"
307
-            hash_files "$dir/containerd"
308
-            hash_files "$dir/containerd-shim"
305
+            if [ "$2" == "hash" ]; then
306
+                hash_files "$dir/runc"
307
+                hash_files "$dir/ctr"
308
+                hash_files "$dir/containerd"
309
+                hash_files "$dir/containerd-shim"
310
+            fi
309 311
         fi
310 312
         )
311 313
     fi
... ...
@@ -61,5 +61,5 @@ go build \
61 61
 echo "Created binary: $DEST/$BINARY_FULLNAME"
62 62
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
63 63
 
64
-copy_containerd "$DEST"
64
+copy_containerd "$DEST" "hash"
65 65
 hash_files "$DEST/$BINARY_FULLNAME"
... ...
@@ -26,5 +26,5 @@ go build -compiler=gccgo \
26 26
 echo "Created binary: $DEST/$BINARY_FULLNAME"
27 27
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
28 28
 
29
-copy_containerd "$DEST"
29
+copy_containerd "$DEST" "hash"
30 30
 hash_files "$DEST/$BINARY_FULLNAME"
... ...
@@ -9,9 +9,10 @@ if [ ! -d "$CROSS/linux/amd64" ]; then
9 9
 	false
10 10
 fi
11 11
 
12
+(
12 13
 for d in "$CROSS/"*/*; do
13
-	GOARCH="$(basename "$d")"
14
-	GOOS="$(basename "$(dirname "$d")")"
14
+	export GOARCH="$(basename "$d")"
15
+	export GOOS="$(basename "$(dirname "$d")")"
15 16
 	BINARY_NAME="docker-$VERSION"
16 17
 	BINARY_EXTENSION="$(export GOOS && binary_extension)"
17 18
 	BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
... ...
@@ -32,3 +33,4 @@ for d in "$CROSS/"*/*; do
32 32
 
33 33
 	echo "Created tgz: $TGZ"
34 34
 done
35
+)