From 7769cd92e67504dbd63941a3485d6e981622ead6 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 11 Nov 2020 13:59:06 -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 [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.* \. ') [1]: https://github.com/containers/podman/issues/2811 --- docs/book/src/cronjob-tutorial/testdata/project/Makefile | 2 +- docs/book/src/multiversion-tutorial/testdata/project/Makefile | 2 +- docs/kubebuilder_v0_v1_difference.md | 2 +- pkg/plugin/v2/scaffolds/internal/templates/makefile.go | 2 +- pkg/plugin/v3/scaffolds/internal/templates/makefile.go | 2 +- testdata/project-v2-addon/Makefile | 2 +- testdata/project-v2-multigroup/Makefile | 2 +- testdata/project-v2/Makefile | 2 +- testdata/project-v3-addon/Makefile | 2 +- testdata/project-v3-multigroup/Makefile | 2 +- testdata/project-v3/Makefile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/book/src/cronjob-tutorial/testdata/project/Makefile b/docs/book/src/cronjob-tutorial/testdata/project/Makefile index 52f5e92d39f..365ac9b8753 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/Makefile +++ b/docs/book/src/cronjob-tutorial/testdata/project/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/docs/book/src/multiversion-tutorial/testdata/project/Makefile b/docs/book/src/multiversion-tutorial/testdata/project/Makefile index 52f5e92d39f..365ac9b8753 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/Makefile +++ b/docs/book/src/multiversion-tutorial/testdata/project/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/docs/kubebuilder_v0_v1_difference.md b/docs/kubebuilder_v0_v1_difference.md index dd8736322da..cd84e2f2abb 100644 --- a/docs/kubebuilder_v0_v1_difference.md +++ b/docs/kubebuilder_v0_v1_difference.md @@ -13,7 +13,7 @@ Kubebuilder 1.0 adds a new flag `--project-version`, it accepts two different va bin/controller-manager --kubeconfig ~/.kube/config kubectl apply -f hack/sample/.yaml - docker build -f Dockerfile.controller . -t + docker build -f Dockerfile.controller -t . docker push kubebuilder create config --controller-image --name kubectl apply -f hack/install.yaml diff --git a/pkg/plugin/v2/scaffolds/internal/templates/makefile.go b/pkg/plugin/v2/scaffolds/internal/templates/makefile.go index 61b7ce5295a..f4c50ce1063 100644 --- a/pkg/plugin/v2/scaffolds/internal/templates/makefile.go +++ b/pkg/plugin/v2/scaffolds/internal/templates/makefile.go @@ -112,7 +112,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/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-v2-addon/Makefile b/testdata/project-v2-addon/Makefile index f6362e191e3..0c8c5a943aa 100644 --- a/testdata/project-v2-addon/Makefile +++ b/testdata/project-v2-addon/Makefile @@ -56,7 +56,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-v2-multigroup/Makefile b/testdata/project-v2-multigroup/Makefile index f6362e191e3..0c8c5a943aa 100644 --- a/testdata/project-v2-multigroup/Makefile +++ b/testdata/project-v2-multigroup/Makefile @@ -56,7 +56,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-v2/Makefile b/testdata/project-v2/Makefile index f6362e191e3..0c8c5a943aa 100644 --- a/testdata/project-v2/Makefile +++ b/testdata/project-v2/Makefile @@ -56,7 +56,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: