Merge branch 'master' into getbinaries-fix-transport

The go program we use to get binaries from a docker image was unpacking
only the last layer. This is not required and in order to have a more
generic approach and fewest requirement the program now unpack all the
image

cmd/getbinariesfromquay/main.go

@@ -98,14 +98,14 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		err = copyBinaryFromLastLayer(path.Join(imgsDir, imgDir), path.Join(releaseDir, imgDir), binaryToCopy)
+		err = untarLayers(path.Join(imgsDir, imgDir), path.Join(releaseDir, imgDir), binaryToCopy)
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
 }
 
-func copyBinaryFromLastLayer(src, dest, binaryPath string) error {
+func untarLayers(src, dest, binaryPath string) error {
 	b, err := ioutil.ReadFile(path.Join(src, "manifest.json"))
 	if err != nil {
 		return err
@@ -114,14 +114,15 @@ func copyBinaryFromLastLayer(src, dest, binaryPath string) error {
 	if err != nil {
 		return err
 	}
-	last := man.LayerInfos()[len(man.LayerInfos())-1]
+	for _, l := range man.LayerInfos() {
-	layerTar, err := os.Open(path.Join(src, last.Digest.String()[7:]))
+		layerTar, err := os.Open(path.Join(src, l.Digest.String()[7:]))
-	if err != nil {
+		if err != nil {
-		return err
+			return err
-	}
+		}
-	err = tar.Untar(src, layerTar)
+		err = tar.Untar(src, layerTar)
-	if err != nil {
+		if err != nil {
-		return err
+			return err
+		}
 	}
 
 	input, err := ioutil.ReadFile(path.Join(src, binaryPath))

current_versions.sh

@@ -7,6 +7,6 @@
 export OSIE_DOWNLOAD_LINK=https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/osie-v0-n=366,c=1aec189,b=master.tar.gz
 export TINKERBELL_TINK_SERVER_IMAGE=quay.io/tinkerbell/tink:sha-0e8e5733
 export TINKERBELL_TINK_CLI_IMAGE=quay.io/tinkerbell/tink-cli:sha-0e8e5733
-export TINKERBELL_TINK_BOOTS_IMAGE=quay.io/tinkerbell/boots:sha-e81a291c
+export TINKERBELL_TINK_BOOTS_IMAGE=quay.io/tinkerbell/boots:sha-45a64dad
 export TINKERBELL_TINK_HEGEL_IMAGE=quay.io/tinkerbell/hegel:sha-c17b512f
 export TINKERBELL_TINK_WORKER_IMAGE=quay.io/tinkerbell/tink-worker:sha-0e8e5733

script/release-binaries.sh

@@ -4,25 +4,25 @@ source ./current_versions.sh
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/hegel \
-	-image docker://quay.io/tinkerbell/hegel:sha-c17b512f \
+	-image docker://${TINKERBELL_TINK_HEGEL_IMAGE} \
 	-program hegel
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/boots \
-	-image docker://quay.io/tinkerbell/boots:sha-e81a291c \
+	-image docker://${TINKERBELL_TINK_BOOTS_IMAGE} \
 	-program boots
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/tink-worker \
-	-image docker://quay.io/tinkerbell/tink-worker:sha-0e8e5733 \
+	-image docker://${TINKERBELL_TINK_WORKER_IMAGE} \
 	-program tink-worker
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/tink-server \
-	-image docker://quay.io/tinkerbell/tink:sha-0e8e5733 \
+	-image docker://${TINKERBELL_TINK_SERVER_IMAGE} \
 	-program tink-server
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/tink \
-	-image docker://quay.io/tinkerbell/tink-cli:sha-0e8e5733 \
+	-image docker://${TINKERBELL_TINK_CLI_IMAGE} \
 	-program tink