From 11356996ca5cb2344d710999ea546986f4563b1b Mon Sep 17 00:00:00 2001
From: TomSweeneyRedHat <tsweeney@redhat.com>
Date: Wed, 11 Aug 2021 20:19:33 -0400
Subject: [PATCH] Bump go for vendor-in-container from 1.13 to 1.16

While vendoring c/storage v1.34.0 I was having issues
with io/fs not being able to be vendored via calls in the
latest BurntSushi.  Fortunately I remembered a change to
the Skopeo Makefile that @vrothberg had made recently and
viola, that fixed it.

Also per @nalind's review, I've bumped Go from 1.13 to 1.6 in the
.cirrus.yml file.

[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
---
 .cirrus.yml | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 860d258b28..2c91a6eee0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -120,7 +120,7 @@ vendor_task:
 
     # Runs within Cirrus's "community cluster"
     container:
-        image: docker.io/library/golang:1.13
+        image: docker.io/library/golang:1.16
         cpu: 1
         memory: 1
 
diff --git a/Makefile b/Makefile
index 8f4982d0a3..03d03c3178 100644
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,7 @@ test-unit: tests/testreport/testreport
 	$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -race ./cmd/buildah -args --root $$tmp/root --runroot $$tmp/runroot --storage-driver vfs --signature-policy $(shell pwd)/tests/policy.json --registries-conf $(shell pwd)/tests/registries.conf
 
 vendor-in-container:
-	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.13 make vendor
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.16 make vendor
 
 .PHONY: vendor
 vendor: