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 \([^ ]*\)/ -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]: containers/podman#2811
[2]: #1817 (comment)
[3]: #1817 (comment)
[4]: #1817 (comment)
[5]: #1817 (comment)
  • Loading branch information
wking committed Nov 16, 2020
1 parent c158f4f commit ccb1127
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
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 build -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 build -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 build -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 build -t ${IMG} .

# Push the docker image
docker-push:
Expand Down

0 comments on commit ccb1127

Please sign in to comment.