Skip to content

Commit 66380c1

Browse files
jmrodriwking
andcommitted
*: 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 We can't change the v2 sample since it still uses the old format. Co-authored-by: W. Trevor King <wking@tremily.us> Signed-off-by: jesus m. rodriguez <jmrodri@gmail.com>
1 parent 008eb22 commit 66380c1

File tree

5 files changed

+35
-4
lines changed

5 files changed

+35
-4
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# entries is a list of entries to include in
2+
# release notes and/or the migration guide
3+
entries:
4+
- description: >
5+
Support folks that may have `docker` aliased to `podman`, and Podman prefers options before positional arguments:
6+
7+
```console
8+
$ podman build --help | grep CONTEXT-DIRECTORY
9+
podman build [command options] CONTEXT-DIRECTORY | URL
10+
```
11+
kind: "change"
12+
breaking: false
13+
14+
# Migration can be defined to automatically add a section to
15+
# the migration guide. This is required for breaking changes.
16+
migration:
17+
header: If you are using podman aliased as docker
18+
body: >
19+
Update the `Makefile`, change the argument of the `docker build` command from
20+
21+
docker build . -t ${IMG}
22+
23+
to
24+
docker build -t ${IMG} .
25+
26+
Alternatively, you could replace it programmatically
27+
28+
```console
29+
$ sed -i 's/docker build . -t ${IMG}/docker build -t ${IMG} ./' $(git grep -l 'docker.*build \. ')
30+
```
31+

internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ undeploy: kustomize
9393
9494
# Build the docker image
9595
docker-build:
96-
docker build . -t ${IMG}
96+
docker build -t ${IMG} .
9797
9898
# Push the docker image
9999
docker-push:

internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ undeploy: kustomize
9393
9494
# Build the docker image
9595
docker-build:
96-
docker build . -t ${IMG}
96+
docker build -t ${IMG} .
9797
9898
# Push the docker image
9999
docker-push:

testdata/ansible/memcached-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ undeploy: kustomize
5656

5757
# Build the docker image
5858
docker-build:
59-
docker build . -t ${IMG}
59+
docker build -t ${IMG} .
6060

6161
# Push the docker image
6262
docker-push:

testdata/helm/memcached-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ undeploy: kustomize
5656

5757
# Build the docker image
5858
docker-build:
59-
docker build . -t ${IMG}
59+
docker build -t ${IMG} .
6060

6161
# Push the docker image
6262
docker-push:

0 commit comments

Comments
 (0)