diff --git a/hack/allow-insecure.tar b/hack/allow-insecure.tar new file mode 100644 index 0000000000..50cae25f58 Binary files /dev/null and b/hack/allow-insecure.tar differ diff --git a/hack/setup-testing-images.sh b/hack/setup-testing-images.sh index a8eacae9b0..dddbcedee4 100755 --- a/hack/setup-testing-images.sh +++ b/hack/setup-testing-images.sh @@ -11,11 +11,8 @@ ko build --tags "latest" -B ./cmd/func # Build custom buildah image for tests. # This image will accept registries ending with .cluster.local as insecure (non-TLS). -docker build . -f - -t quay.io/buildah/stable:v1.31.0 <> '/etc/containers/registries.conf' -EOF - -docker image save quay.io/buildah/stable:v1.31.0 | \ +crane append --base=quay.io/buildah/stable:v1.31.0 \ + --new_layer="$(dirname "$0")/allow-insecure.tar" \ + --new_tag=quay.io/buildah/stable:v1.31.0 \ + --output=/dev/stdout | \ docker exec -i func-control-plane ctr -n=k8s.io images import - -docker rmi quay.io/buildah/stable:v1.31.0