From ccb112768cf957d4d69036d5aef560033fd760bd Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 11 Nov 2020 13:59:06 -0800
Subject: [PATCH] :sparkles: *: Replace 'docker build . -t ${IMG}' with '-t
 ${IMG} .'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because folks may have 'docker' aliased to 'podman', and Podman
prefers options before positional arguments [1]:

  $ podman build --help | grep CONTEXT-DIRECTORY
     podman build [command options] CONTEXT-DIRECTORY | URL

Generated with:

  $ sed -i 's/ . -t \([^ ]*\)/ -t \1 ./' $(git grep -l 'docker.*build.* \. ')
  $ git checkout HEAD -- docs
  $ git checkout HEAD -- pkg/plugin/v2 testdata/project-v2*

The docs checkout leaves historical docs alone [2,3,4].  The v2
checkouts are because Adrián and Camila consider this minor and not
worth fixing in v2 [5].

[1]: https://github.com/containers/podman/issues/2811
[2]: https://github.com/kubernetes-sigs/kubebuilder/pull/1817#discussion_r521745568
[3]: https://github.com/kubernetes-sigs/kubebuilder/pull/1817#discussion_r524620399
[4]: https://github.com/kubernetes-sigs/kubebuilder/pull/1817#discussion_r524621326
[5]: https://github.com/kubernetes-sigs/kubebuilder/pull/1817#discussion_r524560618
---
 pkg/plugin/v3/scaffolds/internal/templates/makefile.go | 2 +-
 testdata/project-v3-addon/Makefile                     | 2 +-
 testdata/project-v3-multigroup/Makefile                | 2 +-
 testdata/project-v3/Makefile                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/plugin/v3/scaffolds/internal/templates/makefile.go b/pkg/plugin/v3/scaffolds/internal/templates/makefile.go
index d69b27741cb..da8ecd8e7c8 100644
--- a/pkg/plugin/v3/scaffolds/internal/templates/makefile.go
+++ b/pkg/plugin/v3/scaffolds/internal/templates/makefile.go
@@ -121,7 +121,7 @@ generate: controller-gen
 
 # Build the docker image
 docker-build: test
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push:
diff --git a/testdata/project-v3-addon/Makefile b/testdata/project-v3-addon/Makefile
index 981f020fecc..5c8bfe1d318 100644
--- a/testdata/project-v3-addon/Makefile
+++ b/testdata/project-v3-addon/Makefile
@@ -63,7 +63,7 @@ generate: controller-gen
 
 # Build the docker image
 docker-build: test
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push:
diff --git a/testdata/project-v3-multigroup/Makefile b/testdata/project-v3-multigroup/Makefile
index 981f020fecc..5c8bfe1d318 100644
--- a/testdata/project-v3-multigroup/Makefile
+++ b/testdata/project-v3-multigroup/Makefile
@@ -63,7 +63,7 @@ generate: controller-gen
 
 # Build the docker image
 docker-build: test
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push:
diff --git a/testdata/project-v3/Makefile b/testdata/project-v3/Makefile
index 981f020fecc..5c8bfe1d318 100644
--- a/testdata/project-v3/Makefile
+++ b/testdata/project-v3/Makefile
@@ -63,7 +63,7 @@ generate: controller-gen
 
 # Build the docker image
 docker-build: test
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push: