From 30f01a984a1cfd9591f9f0ee25c1dc65cc71fa23 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 11 Nov 2020 12:13:46 -0800
Subject: [PATCH] *: Replace 'docker build . -t ${IMG}' with '-t ${IMG} .'

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

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

Generated with:

  $ sed -i 's/docker build . -t ${IMG}/docker build -t ${IMG} ./' $(git grep -l 'docker.*build \. ')
---
 .../plugins/ansible/v1/scaffolds/internal/templates/makefile.go | 2 +-
 .../plugins/helm/v1/scaffolds/internal/templates/makefile.go    | 2 +-
 testdata/ansible/memcached-operator/Makefile                    | 2 +-
 testdata/go/memcached-operator/Makefile                         | 2 +-
 testdata/helm/memcached-operator/Makefile                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go
index eed94ddd3b..601ac76d32 100644
--- a/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go
+++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go
@@ -93,7 +93,7 @@ undeploy: kustomize
 
 # Build the docker image
 docker-build:
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push:
diff --git a/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go b/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go
index 95adbe5dba..c5c85779fb 100644
--- a/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go
+++ b/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go
@@ -93,7 +93,7 @@ undeploy: kustomize
 
 # Build the docker image
 docker-build:
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push:
diff --git a/testdata/ansible/memcached-operator/Makefile b/testdata/ansible/memcached-operator/Makefile
index eed3911bc9..a8dbbe6be6 100644
--- a/testdata/ansible/memcached-operator/Makefile
+++ b/testdata/ansible/memcached-operator/Makefile
@@ -39,7 +39,7 @@ undeploy: kustomize
 
 # Build the docker image
 docker-build:
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push:
diff --git a/testdata/go/memcached-operator/Makefile b/testdata/go/memcached-operator/Makefile
index 12c07cdaee..728e828c27 100644
--- a/testdata/go/memcached-operator/Makefile
+++ b/testdata/go/memcached-operator/Makefile
@@ -71,7 +71,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/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile
index 6e63eef6a3..6a5d35a86e 100644
--- a/testdata/helm/memcached-operator/Makefile
+++ b/testdata/helm/memcached-operator/Makefile
@@ -39,7 +39,7 @@ undeploy: kustomize
 
 # Build the docker image
 docker-build:
-	docker build . -t ${IMG}
+	docker build -t ${IMG} .
 
 # Push the docker image
 docker-push: