Skip to content

Commit

Permalink
*: Replace 'docker build . -t ${IMG}' with '-t ${IMG} .'
Browse files Browse the repository at this point in the history
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 \([^ ]*\)/build -t \1 ./' $(git grep -l 'docker.*build.* \. ')

[1]: containers/podman#2811
  • Loading branch information
wking committed Nov 11, 2020
1 parent c158f4f commit 9e997ee
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/book/src/cronjob-tutorial/testdata/project/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion docs/kubebuilder_v0_v1_difference.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/<resource>.yaml
docker build -f Dockerfile.controller . -t <image:tag>
docker build -f Dockerfile.controllerbuild -t <image:tag> .
docker push <image:tag>
kubebuilder create config --controller-image <image:tag> --name <project-name>
kubectl apply -f hack/install.yaml
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/v2/scaffolds/internal/templates/makefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ generate: controller-gen
# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .
# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/v3/scaffolds/internal/templates/makefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ generate: controller-gen
# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .
# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v2-addon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v2-multigroup/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-addon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ generate: controller-gen

# Build the docker image
docker-build: test
docker build . -t ${IMG}
docker buildbuild -t ${IMG} .

# Push the docker image
docker-push:
Expand Down

0 comments on commit 9e997ee

Please sign in to comment.