Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

inconsistent names of the entryPoint configuration parameter #1488

Merged
merged 2 commits into from
Nov 5, 2021
Merged

inconsistent names of the entryPoint configuration parameter #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcfc005
fix examples
energister Aug 24, 2021
0387f4d
RunImageConfiguration: `@Deprecate` `entrypoint` parameter field
rohanKanojia Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
- Allow replacement in tags. Added a new replacement `%T` which always adds a timestamp. ([#1491](https://github.com/fabric8io/docker-maven-plugin/pull/1491))
- Only push the `latest` tag if no other tags where specified in docker mode. This can break your build, if you rely on the automatic `latest` tag. ([#1496](https://github.com/fabric8io/docker-maven-plugin/pull/1496))
- Only push the `latest` tag if no other tags where specified in jib mode. This can break your build, if you rely on the automatic `latest` tag. ([#1498](https://github.com/fabric8io/docker-maven-plugin/pull/1498))
- Deprecate `entrypoint` parameter in `<run>` configuration ([1488](https://github.com/fabric8io/docker-maven-plugin/pull/1488))

**Note:** `entrypoint` parameter in `<run>` configuration is marked as deprecated. Users are advised to use `entryPoint` parameter instead.

* **0.37.0** (2021-08-15)
- Fix stop mojo by taking container name pattern into account (#1168)
Expand Down
18 changes: 16 additions & 2 deletions src/main/java/io/fabric8/maven/docker/config/RunImageConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,17 @@ public boolean isDefault() {
@Parameter
private List<String> dependsOn;

// container entry point
/**
* container entry point
* @deprecated This field would be removed in upcoming releases. Use <code>entryPoint</code> instead.
*/
@Parameter
@Deprecated
private Arguments entrypoint;

@Parameter
private Arguments entryPoint;

// container hostname
@Parameter
private String hostname;
Expand Down Expand Up @@ -201,6 +208,9 @@ public String initAndValidate() {
if (entrypoint != null) {
entrypoint.validate();
}
if (entryPoint != null) {
entryPoint.validate();
}
if (cmd != null) {
cmd.validate();
}
Expand All @@ -227,7 +237,10 @@ public String getEnvPropertyFile() {
}

public Arguments getEntrypoint() {
return entrypoint;
if (entrypoint != null) {
return entrypoint;
}
return entryPoint;
}

public String getHostname() {
Expand Down Expand Up @@ -478,6 +491,7 @@ public Builder domainname(String domainname) {

public Builder entrypoint(Arguments args) {
config.entrypoint = args;
config.entryPoint = args;
return this;
}

Expand Down